diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-12 13:41:53 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-12 15:15:06 -0500 |
commit | 1aaf9a9b362188eb706eae2b6b93df35266047d3 (patch) | |
tree | ccc8b9f8f1eb4019ac2c822b19eda6b498337382 /sw/source | |
parent | e31807c83009655c342c929a118f0d28a8f63ddc (diff) |
Renamed hard-to-remember 8-char headers in editeng.
Change-Id: If255802082890e1b1b4c5197a791fa79a011773e
Diffstat (limited to 'sw/source')
139 files changed, 262 insertions, 262 deletions
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 49cbb144da1f..c931ee6af0c9 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -18,7 +18,7 @@ */ #include <hintids.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <flyfrm.hxx> #include <rootfrm.hxx> #include <txtfrm.hxx> diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 9268639bc6f5..4ae32a3f0e4e 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -63,7 +63,7 @@ #include <unomap.hxx> #include <unoprnms.hxx> #include <com/sun/star/text/WritingMode2.hpp> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <viewimp.hxx> #include <boost/scoped_ptr.hpp> #include <textmarkuphelper.hxx> diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index ed9e751fc4b5..fe0de02476e2 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -22,8 +22,8 @@ #include <cmdid.h> #include <doc.hxx> #include <editeng/colritem.hxx> -#include <editeng/brshitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/boxitem.hxx> #include <fmtpdsc.hxx> #include <hintids.hxx> diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index e3b64ac45337..fc0114be0d07 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -28,21 +28,21 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <doc.hxx> #include <editeng/acorrcfg.hxx> -#include <editeng/akrnitem.hxx> -#include <editeng/blnkitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/blinkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/charhiddenitem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/cmapitem.hxx> -#include <editeng/cscoitem.hxx> -#include <editeng/emphitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/charsetcoloritem.hxx> +#include <editeng/emphasismarkitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/forbiddenruleitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/hngpnctitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/kernitem.hxx> #include <editeng/langitem.hxx> diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 82a66c957595..197836c63344 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -21,8 +21,8 @@ #include <comphelper/string.hxx> #include <svl/itemiter.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <svx/svdobj.hxx> #include <crsrsh.hxx> #include <doc.hxx> diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 8df43bef7d71..b464f9619c0d 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -25,7 +25,7 @@ #include <vcl/svapp.hxx> #include <svl/itemiter.hxx> #include <svl/whiter.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/colritem.hxx> #include <editeng/fontitem.hxx> #include <fmtpdsc.hxx> diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 993eefc0027f..cd71cf5e6b27 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -46,8 +46,8 @@ #include <unotools/syslocale.hxx> #include <sfx2/printer.hxx> #include <editeng/keepitem.hxx> -#include <editeng/cscoitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/charsetcoloritem.hxx> +#include <editeng/formatbreakitem.hxx> #include <sfx2/linkmgr.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <svx/svdmodel.hxx> diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 0df87ac7af8c..8d19f5445bd7 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -20,7 +20,7 @@ #include <hintids.hxx> #include <vcl/vclenum.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/colritem.hxx> #include <editeng/boxitem.hxx> #include <editeng/svxenum.hxx> diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index dec44945f1a2..f63231b447af 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -25,7 +25,7 @@ #include <editeng/eeitem.hxx> #include <editeng/langitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <svl/whiter.hxx> #include <svl/zforlist.hxx> #include <comphelper/processfactory.hxx> diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index b4078c84a489..72d5757744c0 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -43,7 +43,7 @@ #include <pamtyp.hxx> #include <redline.hxx> #include <comcore.hrc> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/frmdiritem.hxx> #include <frmatr.hxx> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index eed72a6dfddf..1313c756cc5a 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -23,7 +23,7 @@ #include <sfx2/app.hxx> #include <editeng/colritem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <swmodule.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index a25a6d61e62b..fa871b20b0b6 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -21,7 +21,7 @@ #include <hintids.hxx> #include <comphelper/string.hxx> #include <editeng/langitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> #include <sot/clsids.hxx> diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 36426c778dc8..763303a94d5b 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -21,7 +21,7 @@ #include <string.h> #include <vcl/font.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/numitem.hxx> #include <fmtornt.hxx> diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 38683a388a1d..0322db38f0a5 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -28,7 +28,7 @@ #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/postitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/opaqitem.hxx> @@ -37,11 +37,11 @@ #include <editeng/udlnitem.hxx> #include <editeng/colritem.hxx> #include <editeng/protitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/langitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/frmdiritem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/scriptspaceitem.hxx> #include <viewopt.hxx> #include <doc.hxx> diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 3635be531598..988b6101cfb9 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <hintids.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/protitem.hxx> #include <editeng/boxitem.hxx> diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index ad3c82c82279..af32fe5716de 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -18,7 +18,7 @@ */ -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <hintids.hxx> #include <fmtpdsc.hxx> diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 252ac7f87197..775359a42bec 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <hintids.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/protitem.hxx> #include <editeng/boxitem.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 3eceef3bc7ec..973acc78dcff 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -21,7 +21,7 @@ #include "hintids.hxx" #include <editeng/lrspitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/frmdiritem.hxx> #include <fmtornt.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index d354394b68a7..859de64d2db3 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -27,12 +27,12 @@ #include <editeng/boxitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brkitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/formatbreakitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/cscoitem.hxx> +#include <editeng/charsetcoloritem.hxx> #include <editeng/unolingu.hxx> #include <editeng/acorrcfg.hxx> diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 514aaccb66d5..8008b5446a26 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -18,7 +18,7 @@ */ #include <hintids.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editsh.hxx> #include <doc.hxx> // fuer SwTxtFmtColls #include <IDocumentUndoRedo.hxx> diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 7144549f658d..a74d10d473ea 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -29,7 +29,7 @@ #include <svx/xflasit.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svx/svdocapt.hxx> #include <svx/svdouno.hxx> #include <svx/xfillit.hxx> diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 3f76844f6ea7..97e41aa44ab0 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -24,7 +24,7 @@ #include <basegfx/vector/b2dvector.hxx> #include <svx/svxids.hrc> #include <editeng/protitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/frmdiritem.hxx> #include <svtools/ruler.hxx> #include <swwait.hxx> diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index cbb50382fb5c..129105614f32 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -87,7 +87,7 @@ #include <unoframe.hxx> #include <unotextbodyhf.hxx> #include <SwStyleNameMapper.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svtools/grfmgr.hxx> #include <cmdid.h> #include <unomid.h> diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 7cbd750a266f..a71f8163ca69 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -30,7 +30,7 @@ #include "dflyobj.hxx" #include "frmtool.hxx" #include "dcontact.hxx" -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> #include <fmtsrnd.hxx> #include <fmtanchr.hxx> diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 75790e451968..a05a56214a7d 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -20,7 +20,7 @@ #include <tools/bigint.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 26b3523ba6eb..81060e118d44 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -50,7 +50,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <editeng/opaqitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <SwSmartTagMgr.hxx> #define _LAYACT_CXX diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index b3720698bbe2..4a9aef7b020f 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -18,7 +18,7 @@ */ #include <hintids.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <tools/stream.hxx> #include <doc.hxx> #include <docstat.hxx> diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 37a8d9b9168d..5aef6a3c60aa 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -20,7 +20,7 @@ #include <editeng/pbinitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/shaditem.hxx> #include "editeng/frmdiritem.hxx" #include <fmtclds.hxx> diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index ef94882646d8..e1d8354b031b 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -20,7 +20,7 @@ #include <vcl/lazydelete.hxx> #include <vcl/gradient.hxx> #include <sfx2/progress.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/opaqitem.hxx> #include <editeng/prntitem.hxx> #include <editeng/boxitem.hxx> diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 3fc12ae55d2d..05676fd10211 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -48,7 +48,7 @@ #include "viewimp.hxx" #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <fmtftntx.hxx> // OD 2004-05-24 #i28701# #include <dflyobj.hxx> diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 5083310364da..ac641d0a00df 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -41,7 +41,7 @@ #include <editeng/keepitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <vcl/outdev.hxx> #include <fmtlsplt.hxx> diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index a53d467058fe..71e2d03884ac 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -22,9 +22,9 @@ #include <hints.hxx> #include <vcl/outdev.hxx> #include <svl/itemiter.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/keepitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <fmtornt.hxx> #include <pagefrm.hxx> #include <section.hxx> diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 466ed909ae24..a56db0fd1171 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -24,7 +24,7 @@ #include <hints.hxx> // for SwAttrSetChg #include <editeng/lrspitem.hxx> #include <editeng/shaditem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/colritem.hxx> #include <sfx2/linkmgr.hxx> #include <editeng/boxitem.hxx> diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 16b905b95ebf..bd84f810dec0 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -24,7 +24,7 @@ #include <vcl/outdev.hxx> #include <tools/multisel.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/langitem.hxx> #include <editeng/scripttypeitem.hxx> diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index e811ed518adc..5cfbfdf47d54 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -22,9 +22,9 @@ #include <vcl/outdev.hxx> #include <editeng/cmapitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/cntritem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/kernitem.hxx> @@ -35,10 +35,10 @@ #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/wrlmitem.hxx> -#include <editeng/akrnitem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/charrotateitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/twolinesitem.hxx> #include <editeng/charhiddenitem.hxx> @@ -46,7 +46,7 @@ #include <charfmt.hxx> #include <fchrfmt.hxx> #include <fmtautofmt.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <fmtinfmt.hxx> #include <txtinet.hxx> #include <IDocumentSettingAccess.hxx> diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 2c47f2650d78..5833bfd264e0 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -20,7 +20,7 @@ #include <hintids.hxx> #include <editeng/keepitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <pagefrm.hxx> // ChangeFtnRef #include <ndtxt.hxx> // MakeFrm() #include <dcontact.hxx> // SwDrawContact diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index d67248aa327b..ad14afb98ac1 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -22,11 +22,11 @@ #include <unotools/lingucfg.hxx> #include <hintids.hxx> #include <sfx2/printer.hxx> -#include <editeng/hyznitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/hyphenzoneitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/hngpnctitem.hxx> #include <editeng/scriptspaceitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/splwrap.hxx> #include <editeng/pgrditem.hxx> #include <editeng/tstpitem.hxx> diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 954741bab6be..e33ef54b805a 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -27,7 +27,7 @@ #include "swselectionlist.hxx" #include <sortedobjs.hxx> #include <editeng/protitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/lrspitem.hxx> #include <frmatr.hxx> diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index 9a4c36757380..981c2dfabf70 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -22,7 +22,7 @@ #include "viewopt.hxx" // SwViewOptions #include "txtatr.hxx" // SwINetFmt #include <tools/multisel.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/lrspitem.hxx> #include <txtinet.hxx> diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index a054df49c318..619e2189d529 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/i18n/ScriptType.hpp> #include <vcl/graph.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <viewopt.hxx> // SwViewOptions diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 79bde320f855..d6ce5bee1001 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -33,11 +33,11 @@ #include <com/sun/star/i18n/CTLScriptType.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <paratr.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/charhiddenitem.hxx> #include <vcl/outdev.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/blinkitem.hxx> #include <tools/multisel.hxx> #include <unotools/charclass.hxx> #include <i18npool/mslangid.hxx> diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index cb35c4c16502..14b6ac27ffd4 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -20,8 +20,8 @@ #include <hintids.hxx> #include <sfx2/printer.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/pgrditem.hxx> #include <vcl/window.hxx> diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index a64fb140abc3..554f5d086011 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -26,7 +26,7 @@ #include <editeng/lspcitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/pgrditem.hxx> #include <swmodule.hxx> #include <SwSmartTagMgr.hxx> diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index b4aa5efd45b4..41ec497a242c 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -31,7 +31,7 @@ #include <charfmt.hxx> #include <dflyobj.hxx> #include <rowfrm.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/charrotateitem.hxx> #include <breakit.hxx> #include <com/sun/star/i18n/ScriptType.hpp> diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 21408f80d180..81035757868c 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -39,7 +39,7 @@ #include <pagedesc.hxx> // SwPageDesc #include <tgrditem.hxx> #include <scriptinfo.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <tools/shl.hxx> #include <swmodule.hxx> #include <accessibilityoptions.hxx> diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 5a743b788a06..aff275343862 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -21,8 +21,8 @@ #include <hints.hxx> #include <editeng/fontitem.hxx> -#include <editeng/brkitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/formatbreakitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/rsiditem.hxx> #include <editeng/tstpitem.hxx> diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 9d25a8fc928e..95e199c267ed 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -23,27 +23,27 @@ #include <vcl/outdev.hxx> #include <unotools/localedatawrapper.hxx> #include <editeng/unolingu.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/wrlmitem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/nhypitem.hxx> #include <editeng/kernitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/escpitem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/escapementitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/charreliefitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/cscoitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/charsetcoloritem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/twolinesitem.hxx> diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index c69574d50a14..6f66720ae9bf 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -25,7 +25,7 @@ #include <svl/stylepool.hxx> #include <editeng/fontitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/lrspitem.hxx> diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 594a081e8607..b90c9a127d2c 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -20,7 +20,7 @@ #include <rolbck.hxx> #include <tools/resid.hxx> #include <svl/itemiter.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <hints.hxx> #include <hintids.hxx> #include <fmtftn.hxx> diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 2387e7adaeed..fc62fcd424b5 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -20,7 +20,7 @@ #include <UndoDelete.hxx> #include <hintids.hxx> #include <unotools/charclass.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <fmtpdsc.hxx> #include <frmfmt.hxx> #include <fmtanchr.hxx> diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx index a12518101065..4f622be818dc 100644 --- a/sw/source/core/undo/unspnd.cxx +++ b/sw/source/core/undo/unspnd.cxx @@ -23,7 +23,7 @@ #include "swtable.hxx" #include "ndtxt.hxx" #include "swundo.hxx" -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <fmtpdsc.hxx> #include <frmfmt.hxx> #include <UndoCore.hxx> diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index ce5807436402..46e0ad6ca7bb 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -28,7 +28,7 @@ #include <UndoCore.hxx> #include <hintids.hxx> #include <hints.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <fmtornt.hxx> #include <fmtpdsc.hxx> #include <doc.hxx> diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 675dcf39a929..dddeee6a7db0 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -76,7 +76,7 @@ #include <unostyle.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/protitem.hxx> #include <fmtornt.hxx> #include <fmturl.hxx> diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index ae80ae389a60..8fd8e382e81b 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -94,7 +94,7 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <fmtflcnt.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/unolingu.hxx> #include <fmtclds.hxx> #include <dcontact.hxx> diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index d288731e1b39..6895f915a3e6 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -94,7 +94,7 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <fmtflcnt.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <fmtclds.hxx> #include <dcontact.hxx> #include <dflyobj.hxx> diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 2f0a7cca7459..1467955cd0cb 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -27,7 +27,7 @@ #include <cmdid.h> #include <hintids.hxx> #include <svl/urihelper.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/xmlcnitm.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/lnkbase.hxx> diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index d142975f95ba..061fd05814df 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -39,7 +39,7 @@ #include <docary.hxx> #include <docstyle.hxx> #include <fmtclds.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <com/sun/star/text/XFootnotesSettingsSupplier.hpp> #include <com/sun/star/text/XFootnote.hpp> #include <com/sun/star/text/XFootnotesSupplier.hpp> diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 28f3b9cd3b02..6bb99d715d93 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -32,7 +32,7 @@ #include <editeng/lrspitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/shaditem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/flstitem.hxx> #include <editeng/paperinf.hxx> #include <pagedesc.hxx> diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 851a8075f1fa..224ebe21aa2f 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -77,7 +77,7 @@ #include <unotextcursor.hxx> #include <unoparagraph.hxx> #include <svl/zforlist.hxx> // SvNumberFormatter -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 36c30614eaac..65d004486287 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -24,7 +24,7 @@ #include <sfx2/printer.hxx> #include <editeng/fontitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/scripttypeitem.hxx> #include <shellio.hxx> #include <doc.hxx> diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index f9159c6ace65..c34be3c566e9 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -25,8 +25,8 @@ #include <editeng/boxitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/colritem.hxx> #include <editeng/fontitem.hxx> @@ -35,10 +35,10 @@ #include <editeng/kernitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brshitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/spltitem.hxx> diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 7c0c227f9bbc..72965f98fb5a 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -28,13 +28,13 @@ #include <svtools/htmltokn.h> #include <svl/whiter.hxx> #include <svx/htmlmode.hxx> -#include <editeng/escpitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/escapementitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/colritem.hxx> #include <editeng/fontitem.hxx> @@ -43,9 +43,9 @@ #include <editeng/kernitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/langitem.hxx> #include <editeng/frmdiritem.hxx> #include <fchrfmt.hxx> diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index ac3ca4d28686..a163ff45bbb5 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -25,12 +25,12 @@ #include <sfx2/docfile.hxx> #include <vcl/svapp.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/flstitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/langitem.hxx> diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 48297009acb4..870a7c48a997 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -21,7 +21,7 @@ #include <svl/itemiter.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/fhgtitem.hxx> #include <svtools/htmltokn.h> diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index a6df34ffa5e0..ff387574ea63 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -32,7 +32,7 @@ #endif #include <svx/xfillit.hxx> #include <editeng/colritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <svl/itemiter.hxx> diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index f9761aade4bc..9bb0d79a0cad 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -37,7 +37,7 @@ #include <editeng/boxitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <fmtanchr.hxx> diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 7487038b60c0..f03b7614ae97 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -31,14 +31,14 @@ #include <sfx2/viewfrm.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/colritem.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <svx/svdouno.hxx> #include <svx/fmglob.hxx> #include <com/sun/star/form/ListSourceType.hpp> diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index c3902987d3f9..3be35bdaaf6e 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -40,14 +40,14 @@ #include <toolkit/helper/vclunohelper.hxx> #include <svx/svdouno.hxx> #include <svx/fmglob.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/colritem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <docsh.hxx> #include <fmtanchr.hxx> #include <docary.hxx> diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 5fd196d80c19..41e740f014ab 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -29,8 +29,8 @@ #include <svl/urihelper.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/colritem.hxx> #include <editeng/boxitem.hxx> #include <editeng/ulspitem.hxx> diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index 3109ca43a879..9c2db5310ad7 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -23,7 +23,7 @@ #include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> #include <svl/urihelper.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 383f61123e9f..025c5133c88c 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -23,9 +23,9 @@ #include <svl/urihelper.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <svtools/htmltokn.h> #include <svtools/htmlkywd.hxx> #include <sfx2/linkmgr.hxx> diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index f3b66fec03d2..9097bd9b32d2 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -22,12 +22,12 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/spltitem.hxx> #include <svtools/htmltokn.h> #include <svtools/htmlkywd.hxx> diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index a1bcb8a0ca94..0949e733aa19 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -25,7 +25,7 @@ #include <vcl/wrkwin.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <com/sun/star/form/XFormsSupplier.hpp> #include <com/sun/star/form/XForm.hpp> diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index eb5f6d705285..c204fb53673e 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -24,16 +24,16 @@ #include <svtools/ctrltool.hxx> #include <svl/urihelper.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/blnkitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/blinkitem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/kernitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/postitem.hxx> #include <editeng/colritem.hxx> #include <editeng/cmapitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/boxitem.hxx> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index ba1919353a91..e15229d5d421 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -46,17 +46,17 @@ #include <editeng/kernitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/escpitem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/escapementitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/colritem.hxx> #include <editeng/fontitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/protitem.hxx> #include <editeng/flstitem.hxx> diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index f0558d008129..0da5a9af7f1c 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -33,7 +33,7 @@ #include <svx/htmlmode.hxx> #include <editeng/lrspitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/langitem.hxx> diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index a6e4806859ce..d4a789f1aad5 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -25,7 +25,7 @@ #include <hintids.hxx> #include <vcl/keycod.hxx> #include <tools/datetime.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <poolfmt.hxx> #include <fmtornt.hxx> #include <ndindex.hxx> diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index 09ebf0ab9583..4be861ef12cd 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -19,7 +19,7 @@ #include <hintids.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <tools/fract.hxx> #include <wrtswtbl.hxx> #include <swtable.hxx> diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 24c4cd5c0f24..13c997adc675 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -28,9 +28,9 @@ #include <editeng/boxitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/cmapitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/postitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <svl/stritem.hxx> #include <unotools/charclass.hxx> #include <txtftn.hxx> diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index b2f867bd5b0e..67d67c90c7a1 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -30,15 +30,15 @@ #include <editeng/ulspitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/colritem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/tstpitem.hxx> #include <svl/urihelper.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx index 0a7b24379a53..5a62675fb481 100644 --- a/sw/source/filter/ww1/w1sprm.cxx +++ b/sw/source/filter/ww1/w1sprm.cxx @@ -22,7 +22,7 @@ #include <tools/solar.h> #include <editeng/paperinf.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/spltitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/boxitem.hxx> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index a2ed719bb62c..0732979b3a68 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -40,23 +40,23 @@ #include <editeng/spltitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/shaditem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/twolinesitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> @@ -64,7 +64,7 @@ #include <editeng/paravertalignitem.hxx> #include <editeng/pgrditem.hxx> #include <editeng/frmdiritem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/charhiddenitem.hxx> #include <editeng/opaqitem.hxx> #include <editeng/editobj.hxx> diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 902c00c1abb4..15796d2d8a73 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -33,36 +33,36 @@ #include <editeng/fontitem.hxx> #include <editeng/tstpitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/spltitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/keepitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/akrnitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/twolinesitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/paravertalignitem.hxx> #include <editeng/frmdiritem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/charhiddenitem.hxx> #include <svx/svdmodel.hxx> #include <svx/fmglob.hxx> diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 3edad2a91624..a2512059b46d 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -39,7 +39,7 @@ #include <editeng/colritem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/paperinf.hxx> diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 2d4ab8d10687..f2570202ecbb 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -32,7 +32,7 @@ #include <svx/svdobj.hxx> //SdrObject #include <svx/svdoole2.hxx> //SdrOle2Obj #include <svx/fmglob.hxx> //FmFormInventor -#include <editeng/brkitem.hxx> //SvxFmtBreakItem +#include <editeng/formatbreakitem.hxx> //SvxFmtBreakItem #include <editeng/tstpitem.hxx> //SvxTabStopItem #include <ndtxt.hxx> //SwTxtNode #include <ndnotxt.hxx> //SwNoTxtNode diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index d0e16d787651..12eabd2dba98 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -35,7 +35,7 @@ #include <editeng/outlobj.hxx> #include <editeng/editobj.hxx> #include <svx/unoshape.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index ebb06774efa8..c91bf51c3b13 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -33,12 +33,12 @@ #include <editeng/langitem.hxx> #include <editeng/svxfont.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/tstpitem.hxx> #include "svl/urihelper.hxx" diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 01d61c5ec9cc..204dffa1d267 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -39,13 +39,13 @@ #include <editeng/tstpitem.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/langitem.hxx> #include <filter/msfilter/msoleexp.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <swtypes.hxx> #include <swrect.hxx> #include <swtblfmt.hxx> diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 096f012af09e..97be47bea066 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -32,34 +32,34 @@ #include <svl/whiter.hxx> #include <editeng/fontitem.hxx> #include <editeng/tstpitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/spltitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/shaditem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/hyznitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/hyphenzoneitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/pbinitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/twolinesitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> @@ -67,7 +67,7 @@ #include <editeng/paravertalignitem.hxx> #include <editeng/pgrditem.hxx> #include <editeng/frmdiritem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/charhiddenitem.hxx> #include <editeng/paperinf.hxx> #include <svx/xfillit0.hxx> diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index da4cae665d09..4001639d3c85 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -41,15 +41,15 @@ #include <editeng/colritem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/postitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/wghtitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> #include <editeng/fontitem.hxx> #include <editeng/ulspitem.hxx> #include <svx/svdoattr.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svx/rectenum.hxx> #include <editeng/opaqitem.hxx> #include <editeng/shaditem.hxx> diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 3e1ccd014c15..705f5173d6cc 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -26,11 +26,11 @@ #include <editeng/colritem.hxx> #include <editeng/orphitem.hxx> #include <editeng/widwitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/langitem.hxx> #include <editeng/charrotateitem.hxx> diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 0b9de038c2ed..37cb65df4a1e 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -58,7 +58,7 @@ #include <editeng/fhgtitem.hxx> #include <editeng/colritem.hxx> #include <editeng/wghtitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/postitem.hxx> #include <unotextrange.hxx> diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index f29383563ae5..658a0f069425 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -30,18 +30,18 @@ #include <editeng/langitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/cntritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/spltitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/orphitem.hxx> #include <editeng/widwitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/shaditem.hxx> @@ -49,9 +49,9 @@ #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/tstpitem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/paperinf.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/forbiddenruleitem.hxx> #include <editeng/twolinesitem.hxx> #include <editeng/scriptspaceitem.hxx> @@ -60,8 +60,8 @@ #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/charreliefitem.hxx> -#include <editeng/blnkitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/blinkitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/paravertalignitem.hxx> #include <editeng/pgrditem.hxx> #include <editeng/frmdiritem.hxx> diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index 2187bb743c8f..05a24adec83d 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -28,7 +28,7 @@ #include <xmloff/XMLBase64ImportContext.hxx> #include <svtools/grfmgr.hxx> #include <svx/unomid.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <xmloff/xmluconv.hxx> #include "xmlbrshi.hxx" diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index bdada36ed32c..71d2f7c8f067 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -38,9 +38,9 @@ #include <editeng/ulspitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include "fmtpdsc.hxx" #include "fmtornt.hxx" #include "fmtfsize.hxx" diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 124a785527c6..11343bbda37a 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -39,9 +39,9 @@ #include <editeng/ulspitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include "fmtpdsc.hxx" #include "fmtornt.hxx" #include "fmtfsize.hxx" diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index d0235e96acec..f23db6f8b43b 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -30,7 +30,7 @@ #include <xmloff/xmltabe.hxx> #include "xmlbrshe.hxx" #include <editeng/tstpitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <tools/fldunit.hxx> #include <swmodule.hxx> #include <doc.hxx> diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 3fc237af18e0..379579dd6de3 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -33,7 +33,7 @@ #include <editeng/boxitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/tstpitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/langitem.hxx> #include <editeng/memberids.hrc> diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index 2f4e4c38a95a..db555aebe122 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -26,9 +26,9 @@ #include <editeng/ulspitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include "fmtpdsc.hxx" #include "fmtornt.hxx" #include "fmtfsize.hxx" diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx index 8187dccdb1f8..1401660430cc 100644 --- a/sw/source/filter/xml/xmlithlp.hxx +++ b/sw/source/filter/xml/xmlithlp.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <xmloff/xmlement.hxx> #include "hintids.hxx" // for following include -#include <editeng/brshitem.hxx> // for SvxGraphicsPosition +#include <editeng/brushitem.hxx> // for SvxGraphicsPosition namespace editeng { class SvxBorderLine; } diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 344ef1dab91d..26d2d60eb506 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -28,7 +28,7 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/numehelp.hxx> #include <svl/zforlist.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <fmtrowsplt.hxx> #include <editeng/frmdiritem.hxx> diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 5ee8e9f6bf23..72ad3251b492 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -39,7 +39,7 @@ #include <editeng/ulspitem.hxx> #include <editeng/pbinitem.hxx> #include <editeng/paperinf.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <fmthdft.hxx> #include <swwait.hxx> #include <paratr.hxx> diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index edeb0582a5ed..eb41720a33fa 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -31,7 +31,7 @@ #include <sfx2/printer.hxx> #include <svx/htmlmode.hxx> #include <sfx2/bindings.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/tstpitem.hxx> #include <svx/optgrid.hxx> #include <svx/svxdlg.hxx> diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 1895bd3cd7e4..08492512353c 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -29,7 +29,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/PasswordHelper.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <basic/sbx.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/misccfg.hxx> diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 73c8a5d31d92..e39bcc65ff31 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -35,8 +35,8 @@ #include <editeng/unolingu.hxx> #include <sfx2/request.hxx> #include <svl/intitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/autokernitem.hxx> #include <linguistic/lngprops.hxx> #include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/i18n/ScriptType.hpp> @@ -50,7 +50,7 @@ #include <editeng/tstpitem.hxx> #include <editeng/langitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/svxacorr.hxx> #include <vcl/svapp.hxx> #include <view.hxx> diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index b57aacc940a7..d158bb9f282f 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -34,7 +34,7 @@ #include <sfx2/newstyle.hxx> #include <sfx2/printer.hxx> #include <svl/macitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svl/stritem.hxx> #include <svl/languageoptions.hxx> #include <editeng/eeitem.hxx> diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 9337d9cd782e..fba5f71cfb71 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -33,10 +33,10 @@ #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <vcl/msgbox.hxx> #include <svl/cjkoptions.hxx> #include <swmodule.hxx> diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index 6e578e113fb6..388e0aabcdb0 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -24,7 +24,7 @@ #include <tools/stream.hxx> #include <sfx2/docfile.hxx> #include <svl/itemiter.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <tools/resid.hxx> #include <fmtornt.hxx> diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index a5f6db6705cc..58b24eeb8fcf 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -53,7 +53,7 @@ #include <editeng/unolingu.hxx> #include <sfx2/app.hxx> #include <svl/itemset.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <svx/rulritem.hxx> #include <swdbtoolsclient.hxx> diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index a564ab20e664..a56454d9db9c 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -19,7 +19,7 @@ #include <hintids.hxx> #include <editeng/wghtitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #ifndef __RSC //autogen #include <tools/errinf.hxx> #endif diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index 0abdb2833b5f..a14b441c2d82 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -55,7 +55,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <sfx2/dispatch.hxx> #include <svl/stritem.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 5258143ae667..818663f34564 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -58,7 +58,7 @@ #include <editeng/scripttypeitem.hxx> #include <editeng/flditem.hxx> #include <editeng/colritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/postitem.hxx> diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx index 88ff9f7c2b5e..7b89ff539639 100644 --- a/sw/source/ui/docvw/romenu.cxx +++ b/sw/source/ui/docvw/romenu.cxx @@ -28,7 +28,7 @@ #include <sfx2/dispatch.hxx> #include <svx/gallery.hxx> #include <svx/graphichelper.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <frmatr.hxx> #include <fmturl.hxx> diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index b6aba22358b1..87b81d863908 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -22,7 +22,7 @@ #include <editeng/paperinf.hxx> #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <vcl/msgbox.hxx> #include <vcl/menu.hxx> diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index a8cac2661fae..cc385f5634c0 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -27,7 +27,7 @@ #include <editeng/ulspitem.hxx> #include <editeng/sizeitem.hxx> #include <svx/pageitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/frmdiritem.hxx> #include <vcl/bitmap.hxx> #include <vcl/builder.hxx> diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index b4148a760c14..48a9dbf190b6 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -32,7 +32,7 @@ #include <editeng/opaqitem.hxx> #include <editeng/protitem.hxx> #include <editeng/prntitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/frmdiritem.hxx> #include <svx/swframevalidation.hxx> diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index 0563d24b5597..ef8657324ab5 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -30,7 +30,7 @@ #include <svtools/treelistbox.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <condedit.hxx> #include <section.hxx> diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 1ade7b99056f..c1d56a55d9f4 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -49,7 +49,7 @@ #include <editeng/svxacorr.hxx> #include <editeng/langitem.hxx> #include <editeng/splwrap.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/unolingu.hxx> #include <i18npool/mslangid.hxx> #include <i18npool/languagetag.hxx> diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 8b49d3a08ad7..db24739fb477 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -22,7 +22,7 @@ #include <sfx2/app.hxx> #include <sfx2/imgmgr.hxx> #include <svx/gallery.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/numitem.hxx> #include <swvset.hxx> diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 3f41278dba46..b30126c4248c 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -22,7 +22,7 @@ #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> #include <sfx2/tabdlg.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <unotools/configmgr.hxx> #include <SwStyleNameMapper.hxx> #include <num.hxx> diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx index 2dffc496a70e..c125fd63cb30 100644 --- a/sw/source/ui/ribbar/concustomshape.cxx +++ b/sw/source/ui/ribbar/concustomshape.cxx @@ -41,7 +41,7 @@ #include <svl/itempool.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <math.h> diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 0762624008a7..b9114e9a2663 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -35,15 +35,15 @@ #include <sfx2/request.hxx> #include <editeng/spltitem.hxx> #include <editeng/orphitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> @@ -52,7 +52,7 @@ #include <svl/slstitm.hxx> #include <editeng/colritem.hxx> #include <editeng/wghtitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/postitem.hxx> #include <editeng/frmdiritem.hxx> #include <svx/svdoutl.hxx> diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 0eb50aa4f503..3123b4fa53db 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -51,7 +51,7 @@ #include <svl/srchitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/opaqitem.hxx> #include <editeng/sizeitem.hxx> #include <svx/flagsdef.hxx> diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 25da3bd8db9f..f2826c52ad39 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -30,20 +30,20 @@ #include <svx/svdview.hxx> #include <editeng/spltitem.hxx> #include <editeng/orphitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/colritem.hxx> #include <editeng/wghtitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/postitem.hxx> #include <editeng/frmdiritem.hxx> #include <svx/svdoutl.hxx> @@ -70,7 +70,7 @@ #include <vcl/window.hxx> #include <editeng/editview.hxx> #include <vcl/outdev.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <cmdid.h> #include <doc.hxx> diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index aec9b2b18107..1db03126324e 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -29,7 +29,7 @@ #include <svl/ptitem.hxx> #include <svl/stritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/protitem.hxx> #include <sfx2/dispatch.hxx> diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index be7cb4005f04..bfee25b84501 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -39,7 +39,7 @@ #include <svx/sdgtritm.hxx> #include <svx/sdginitm.hxx> #include <svx/sdgmoitm.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svx/grfflt.hxx> #include <svx/tbxcolor.hxx> #include <fmturl.hxx> diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 2e4ae0985d9b..70fa7bb3811d 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -20,7 +20,7 @@ #include "cmdid.h" #include "hintids.hxx" #include <editeng/sizeitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> #include <sfx2/objface.hxx> diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index f5830035ca0b..85cd1e535f53 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.cxx @@ -35,7 +35,7 @@ #include <svx/sdgtritm.hxx> #include <svx/sdginitm.hxx> #include <svx/sdgmoitm.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svx/grfflt.hxx> #include <fmturl.hxx> #include <view.hxx> diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index f4236a6d691e..a8c365f92798 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -43,11 +43,11 @@ #include <editeng/protitem.hxx> #include <editeng/opaqitem.hxx> #include <editeng/tstpitem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/kernitem.hxx> #include <editeng/spltitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/pbinitem.hxx> @@ -55,22 +55,22 @@ #include <editeng/prntitem.hxx> #include <editeng/orphitem.hxx> #include <editeng/widwitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/pmdlitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/brkitem.hxx> -#include <editeng/hyznitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/formatbreakitem.hxx> +#include <editeng/hyphenzoneitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/postitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> #include <editeng/boxitem.hxx> #include <editeng/sizeitem.hxx> @@ -111,7 +111,7 @@ #include "grfatr.hxx" #include "fmtline.hxx" #include <svx/clipfmtitem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/blinkitem.hxx> #include <svl/slstitm.hxx> #include <editeng/paravertalignitem.hxx> #include <editeng/charreliefitem.hxx> diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index c3ce9a144eb9..cdd223e1bce6 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -26,13 +26,13 @@ #include <svl/srchitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/spltitem.hxx> #include <editeng/langitem.hxx> #include <editeng/keepitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/colritem.hxx> #include <editeng/frmdiritem.hxx> #include <svx/numinf.hxx> diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 40baae611248..8f00d4b603d9 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -45,7 +45,7 @@ #include <sfx2/request.hxx> #include <editeng/opaqitem.hxx> #include <editeng/fontitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/sizeitem.hxx> #include <editeng/svxacorr.hxx> diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index f84c52e5b3f5..147907c81764 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -45,7 +45,7 @@ #include <editeng/lrspitem.hxx> #include <editeng/colritem.hxx> #include <editeng/tstpitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/svxacorr.hxx> #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index d40c091d2c78..94df0389a173 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -28,10 +28,10 @@ #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <svx/htmlmode.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/frmdiritem.hxx> diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index e842fe14efb3..b60f6db2cfc2 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -23,7 +23,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <editeng/numitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <numrule.hxx> #include "cmdid.h" diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx index b4d1197ed84f..e8cd4bb7ad20 100644 --- a/sw/source/ui/table/swtablerep.cxx +++ b/sw/source/ui/table/swtablerep.cxx @@ -23,7 +23,7 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <editeng/keepitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/frmdiritem.hxx> #include <svl/ctloptions.hxx> diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 656ba32d08b3..0251780f60b3 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -23,7 +23,7 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <editeng/keepitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/frmdiritem.hxx> #include <svl/ctloptions.hxx> diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 59ac47cbb1ea..f07a1f36dc2b 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -34,13 +34,13 @@ // header for class SdrView #include <svx/svdview.hxx> //SvxBrushItem -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/shaditem.hxx> #include <frmatr.hxx> // header for class SvxBoxInfoItem #include <editeng/boxitem.hxx> // header for class SvxFmtBreakItem -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> // header for class SwFmtLayoutSplit #include <fmtlsplt.hxx> // header for class SvxFmtKeepItem diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index 4d563ef9f6b5..2be70054205d 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -32,7 +32,7 @@ #include <editeng/protitem.hxx> #include <sfx2/linkmgr.hxx> #include <editeng/langitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svx/htmlmode.hxx> #include <editeng/unolingu.hxx> #include <sfx2/msgpool.hxx> diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 018c1c32035b..f83bc57e5975 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -44,7 +44,7 @@ #include <tools/cachestr.hxx> #include <unotools/moduleoptions.hxx> #include <editeng/sizeitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/svxacorr.hxx> #include <editeng/ulspitem.hxx> #include <vcl/graph.hxx> |