diff options
298 files changed, 650 insertions, 650 deletions
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 1550998294ae..6575587535b5 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -26,7 +26,7 @@ #include <editeng/eeitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/fontitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/fhgtitem.hxx> diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 148743e16177..f2a0423f66c8 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -40,7 +40,7 @@ #include <editeng/sizeitem.hxx> // header for class SfxStringItem #include <svl/stritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> //SfxIntegerListItem #include <svl/ilstitem.hxx> #include <vcl/graph.hxx> diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 1820e80fdc1d..6ab29b3ac7d7 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -28,7 +28,7 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svl/itempool.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> #include <svx/fmmodel.hxx> diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index a8ce6824aac9..49c94d5b129d 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -33,11 +33,11 @@ #include <osl/mutex.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <svx/dialogs.hrc> #include <svx/drawitem.hxx> #include <editeng/eeitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/orphitem.hxx> #include <editeng/spltitem.hxx> #include <svx/svxdlg.hxx> diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 8847ffad4ac4..fdf6a3f6e1f3 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -23,7 +23,7 @@ #include "chartview/ChartSfxItemIds.hxx" #include <svx/chrtitem.hxx> #include <svl/intitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/sizeitem.hxx> #include <svl/stritem.hxx> #include <svl/rectitem.hxx> diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index cfc5b98b179b..f1c6947a0fa3 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -41,7 +41,7 @@ #include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <optjsearch.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include "backgrnd.hxx" diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index fdeb7bcf94fb..b5c2f6309783 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -41,7 +41,7 @@ #define TBL_DEST_ROW 1 #define TBL_DEST_TBL 2 -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include "backgrnd.hxx" #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 1365dedc76cd..8fd5dae6cdd9 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -19,7 +19,7 @@ #include "borderconn.hxx" #include <svx/frmsel.hxx> -#include "editeng/bolnitem.hxx" +#include "editeng/lineitem.hxx" #include <editeng/boxitem.hxx> #include <svx/algitem.hxx> #include <editeng/shaditem.hxx> diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index fd3829db0223..7622e9d4a85f 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -37,21 +37,21 @@ #include "editeng/fontitem.hxx" #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/langitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/prszitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/blinkitem.hxx> #include "editeng/flstitem.hxx" -#include <editeng/akrnitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/colritem.hxx> #include "svx/drawitem.hxx" #include "svx/dlgutil.hxx" @@ -59,7 +59,7 @@ #include "svx/htmlmode.hxx" #include "cuicharmap.hxx" #include "chardlg.h" -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/twolinesitem.hxx> #include <editeng/charhiddenitem.hxx> diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 1d3694b22a65..8e4a46c065f5 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -25,7 +25,7 @@ #include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <editeng/sizeitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <grfpage.hxx> #include <svx/grfcrop.hxx> #include <grfpage.hrc> diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 8e9fc4a6400b..252e57e48d25 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -33,7 +33,7 @@ #include <vcl/svapp.hxx> #include <svx/gallery.hxx> #include <svl/urihelper.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <vcl/graph.hxx> diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 81bdbb33a0b9..be4ed9e3562d 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -36,7 +36,7 @@ #include "helpid.hrc" #include "page.hxx" #include <svx/pageitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/pbinitem.hxx> diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 693012ce9b5e..673e1dcbcac4 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -34,16 +34,16 @@ #include "paragrph.hxx" #include <editeng/frmdiritem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/orphitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/pmdlitem.hxx> #include <editeng/spltitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> #include "svx/dlgutil.hxx" #include <dialmgr.hxx> diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index b9e77b073d01..f79505e108b0 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -46,7 +46,7 @@ #include <editeng/numitem.hxx> #include <editeng/svxenum.hxx> #include <sfx2/objsh.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svx/gallery.hxx> #include <svx/xbitmap.hxx> #include <unotools/localfilehelper.hxx> diff --git a/editeng/Package_inc.mk b/editeng/Package_inc.mk index 2978ec14de02..4794507ca193 100644 --- a/editeng/Package_inc.mk +++ b/editeng/Package_inc.mk @@ -27,24 +27,24 @@ $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleSelectionBas $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStaticTextBase.hxx,editeng/AccessibleStaticTextBase.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStringWrap.hxx,editeng/AccessibleStringWrap.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/acorrcfg.hxx,editeng/acorrcfg.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/adjitem.hxx,editeng/adjitem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/akrnitem.hxx,editeng/akrnitem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/blnkitem.hxx,editeng/blnkitem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bolnitem.hxx,editeng/bolnitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/adjustitem.hxx,editeng/adjustitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/autokernitem.hxx,editeng/autokernitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/blinkitem.hxx,editeng/blinkitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lineitem.hxx,editeng/lineitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/borderline.hxx,editeng/borderline.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/boxitem.hxx,editeng/boxitem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brkitem.hxx,editeng/brkitem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brshitem.hxx,editeng/brshitem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bulitem.hxx,editeng/bulitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/formatbreakitem.hxx,editeng/formatbreakitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brushitem.hxx,editeng/brushitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bulletitem.hxx,editeng/bulletitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charhiddenitem.hxx,editeng/charhiddenitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charreliefitem.hxx,editeng/charreliefitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charrotateitem.hxx,editeng/charrotateitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charscaleitem.hxx,editeng/charscaleitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cmapitem.hxx,editeng/cmapitem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cntritem.hxx,editeng/cntritem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/contouritem.hxx,editeng/contouritem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/colritem.hxx,editeng/colritem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/crsditem.hxx,editeng/crsditem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cscoitem.hxx,editeng/cscoitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/crossedoutitem.hxx,editeng/crossedoutitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charsetcoloritem.hxx,editeng/charsetcoloritem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editdata.hxx,editeng/editdata.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editeng.hxx,editeng/editeng.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editengdllapi.h,editeng/editengdllapi.h)) @@ -60,8 +60,8 @@ $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eedata.hxx,editeng/eed $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitem.hxx,editeng/eeitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitemid.hxx,editeng/eeitemid.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eerdll.hxx,editeng/eerdll.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/emphitem.hxx,editeng/emphitem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/escpitem.hxx,editeng/escpitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/emphasismarkitem.hxx,editeng/emphasismarkitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/escapementitem.hxx,editeng/escapementitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fhgtitem.hxx,editeng/fhgtitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fieldupdater.hxx,editeng/fieldupdater.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/flditem.hxx,editeng/flditem.hxx)) @@ -74,7 +74,7 @@ $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/frmdiritem.hxx,editeng $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fwdtitem.hxx,editeng/fwdtitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hangulhanja.hxx,editeng/hangulhanja.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hngpnctitem.hxx,editeng/hngpnctitem.hxx)) -$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hyznitem.hxx,editeng/hyznitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hyphenzoneitem.hxx,editeng/hyphenzoneitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/itemtype.hxx,editeng/itemtype.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/justifyitem.hxx,editeng/justifyitem.hxx)) $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/keepitem.hxx,editeng/keepitem.hxx)) diff --git a/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjustitem.hxx index 64eceafec178..64eceafec178 100644 --- a/editeng/inc/editeng/adjitem.hxx +++ b/editeng/inc/editeng/adjustitem.hxx diff --git a/editeng/inc/editeng/akrnitem.hxx b/editeng/inc/editeng/autokernitem.hxx index 19e089edf324..19e089edf324 100644 --- a/editeng/inc/editeng/akrnitem.hxx +++ b/editeng/inc/editeng/autokernitem.hxx diff --git a/editeng/inc/editeng/blnkitem.hxx b/editeng/inc/editeng/blinkitem.hxx index 4ef638ed6f4e..4ef638ed6f4e 100644 --- a/editeng/inc/editeng/blnkitem.hxx +++ b/editeng/inc/editeng/blinkitem.hxx diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brushitem.hxx index c92f406a0f18..c92f406a0f18 100644 --- a/editeng/inc/editeng/brshitem.hxx +++ b/editeng/inc/editeng/brushitem.hxx diff --git a/editeng/inc/editeng/bulitem.hxx b/editeng/inc/editeng/bulletitem.hxx index 345cf3ff7639..345cf3ff7639 100644 --- a/editeng/inc/editeng/bulitem.hxx +++ b/editeng/inc/editeng/bulletitem.hxx diff --git a/editeng/inc/editeng/cscoitem.hxx b/editeng/inc/editeng/charsetcoloritem.hxx index 6fc197fb1394..6fc197fb1394 100644 --- a/editeng/inc/editeng/cscoitem.hxx +++ b/editeng/inc/editeng/charsetcoloritem.hxx diff --git a/editeng/inc/editeng/cntritem.hxx b/editeng/inc/editeng/contouritem.hxx index 079b1d41f64a..316f21fc774e 100644 --- a/editeng/inc/editeng/cntritem.hxx +++ b/editeng/inc/editeng/contouritem.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVX_ITEM_HXX -#define _SVX_ITEM_HXX +#ifndef __EDITENG_CONTOUR_ITEM_HXX__ +#define __EDITENG_CONTOUR_ITEM_HXX__ #include <svl/eitem.hxx> #include <editeng/editengdllapi.h> diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crossedoutitem.hxx index 6906d185639e..6906d185639e 100644 --- a/editeng/inc/editeng/crsditem.hxx +++ b/editeng/inc/editeng/crossedoutitem.hxx diff --git a/editeng/inc/editeng/emphitem.hxx b/editeng/inc/editeng/emphasismarkitem.hxx index 7e9695f0be69..7e9695f0be69 100644 --- a/editeng/inc/editeng/emphitem.hxx +++ b/editeng/inc/editeng/emphasismarkitem.hxx diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escapementitem.hxx index d16adbc1aa22..d16adbc1aa22 100644 --- a/editeng/inc/editeng/escpitem.hxx +++ b/editeng/inc/editeng/escapementitem.hxx diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/formatbreakitem.hxx index 9aab77c02c86..9aab77c02c86 100644 --- a/editeng/inc/editeng/brkitem.hxx +++ b/editeng/inc/editeng/formatbreakitem.hxx diff --git a/editeng/inc/editeng/hyznitem.hxx b/editeng/inc/editeng/hyphenzoneitem.hxx index cacaf8cb1cb7..cacaf8cb1cb7 100644 --- a/editeng/inc/editeng/hyznitem.hxx +++ b/editeng/inc/editeng/hyphenzoneitem.hxx diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/lineitem.hxx index 07ad4da38bc5..07ad4da38bc5 100644 --- a/editeng/inc/editeng/bolnitem.hxx +++ b/editeng/inc/editeng/lineitem.hxx diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index 9876b9eefdd3..59dc36a3e4c7 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -29,18 +29,18 @@ #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/colritem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cscoitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/charsetcoloritem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charreliefitem.hxx> diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 88aa0e3e8573..7d3d31b53aa2 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -26,22 +26,22 @@ #include <editeng/lspcitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/kernitem.hxx> #include <editeng/wrlmitem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/numitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/charscaleitem.hxx> diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 9b96ed77fef5..568299bd207c 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -26,20 +26,20 @@ #include <editeng/tstpitem.hxx> #include <editeng/colritem.hxx> #include <editeng/fontitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/kernitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/cntritem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/akrnitem.hxx> -#include <editeng/cscoitem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/charsetcoloritem.hxx> #include <editeng/langitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/xmlcnitm.hxx> diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 762fcaf8b479..42f4a1811885 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -39,11 +39,11 @@ #include <editeng/txtrange.hxx> #include <vcl/graph.hxx> -#include <editeng/akrnitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/kernitem.hxx> @@ -53,10 +53,10 @@ #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/wrlmitem.hxx> -#include <editeng/brshitem.hxx> -#include <editeng/cscoitem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/charsetcoloritem.hxx> #include <editeng/langitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charreliefitem.hxx> @@ -64,7 +64,7 @@ #include <sot/formats.hxx> #include <editeng/numitem.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/unolingu.hxx> #include <linguistic/lngprops.hxx> #include <i18npool/mslangid.hxx> diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 244978781356..34b91b771fdb 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -33,13 +33,13 @@ #include <editattr.hxx> #include <editeng/editeng.hxx> #include <editeng/fontitem.hxx> -#include <editeng/cscoitem.hxx> +#include <editeng/charsetcoloritem.hxx> #include <editeng/flditem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/tstpitem.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/numitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <vcl/graph.hxx> #include <svl/intitem.hxx> diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index cae0a756d057..24780099c2a9 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -23,7 +23,7 @@ #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <eehtml.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/flditem.hxx> #include <tools/urlobj.hxx> #include <editeng/fhgtitem.hxx> diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index 8c076ff1c41b..0ad2efce6a99 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -30,21 +30,21 @@ #include <editeng/eerdll.hxx> #include <eerdll2.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/tstpitem.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/flditem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/scriptspaceitem.hxx> #include <svl/itempool.hxx> #include <vcl/virdev.hxx> -#include <editeng/akrnitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cscoitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/charsetcoloritem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/kernitem.hxx> diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index 04622ca9cfa8..3d64a9943a8e 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -26,7 +26,7 @@ #include <eertfpar.hxx> #include <impedit.hxx> #include <svl/intitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/flditem.hxx> diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 3269fc6beb46..a6d6dda4a4ca 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -44,7 +44,7 @@ #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/fontitem.hxx> diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 75b18b372e74..4f94c06e1bff 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -25,7 +25,7 @@ #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/flditem.hxx> @@ -33,7 +33,7 @@ #include <editeng/editeng.hxx> #include <editeng/editview.hxx> #include <editeng/txtrange.hxx> -#include <editeng/cscoitem.hxx> +#include <editeng/charsetcoloritem.hxx> #include <editeng/colritem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/fhgtitem.hxx> diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index a00e28e48f69..7d34c1451f9a 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -25,7 +25,7 @@ #include <svl/srchitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/tstpitem.hxx> #include <eertfpar.hxx> @@ -38,11 +38,11 @@ #include "editxml.hxx" -#include <editeng/akrnitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/kernitem.hxx> @@ -55,7 +55,7 @@ #include <editeng/langitem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/frmdiritem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <textconv.hxx> #include <rtl/tencinfo.h> #include <svtools/rtfout.hxx> diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 6b93d576429f..42ed83f56b15 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -22,7 +22,7 @@ #define _SVX_BULITEM_CXX -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/editrids.hrc> #include <tools/tenccvt.hxx> diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 1d6798c495d8..a35808f8618a 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -66,10 +66,10 @@ #include <editeng/protitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> -#include <editeng/bolnitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/lineitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/itemtype.hxx> #include <editeng/eerdll.hxx> diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 5cf1227c4238..9a71ec5e140a 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <vcl/font.hxx> #include <editeng/editids.hrc> #include <editeng/editrids.hrc> diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index f9e7c5ed7378..d247bb837031 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -33,13 +33,13 @@ using namespace ::com::sun::star; #include <svl/memberid.hrc> #include <editeng/editrids.hrc> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/orphitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/pmdlitem.hxx> #include <editeng/spltitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/scriptspaceitem.hxx> #include <editeng/hngpnctitem.hxx> #include <editeng/forbiddenruleitem.hxx> diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 3d9d2252f030..7d5e72dc3336 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -26,7 +26,7 @@ #include <editeng/unolingu.hxx> #include <com/sun/star/i18n/KCharacterType.hpp> #include <editeng/svxfont.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> // Minimum: Percentage of kernel #define MINKERNPERCENT 5 diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index a993a15bc62c..f7a6e807672e 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -68,23 +68,23 @@ #include <editeng/fhgtitem.hxx> #include <editeng/fwdtitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/wrlmitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/prszitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/cscoitem.hxx> +#include <editeng/charsetcoloritem.hxx> #include <editeng/kernitem.hxx> #include <editeng/cmapitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/langitem.hxx> #include <editeng/nlbkitem.hxx> #include <editeng/nhypitem.hxx> #include <editeng/lcolitem.hxx> -#include <editeng/blnkitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/blinkitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/twolinesitem.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/charrotateitem.hxx> diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index f311fa6523af..f6fd9ba51c86 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -44,7 +44,7 @@ #include <sot/storage.hxx> #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/svxacorr.hxx> #include <editeng/unolingu.hxx> #include "vcl/window.hxx" diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 607e66a0d44c..5eed71a46a30 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -43,13 +43,13 @@ #include <svl/whiter.hxx> #include <vcl/metric.hxx> #include <editeng/numitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <vcl/graph.hxx> #include <vcl/gdimtf.hxx> #include <vcl/metaact.hxx> #include <svtools/grfmgr.hxx> #include <editeng/svxfont.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svl/itempool.hxx> // calculate if it's RTL or not diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index a8b100cde7da..a5e7a771b97f 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -25,23 +25,23 @@ #include <editeng/fhgtitem.hxx> #include <editeng/fwdtitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/wrlmitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/prszitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/cscoitem.hxx> +#include <editeng/charsetcoloritem.hxx> #include <editeng/kernitem.hxx> #include <editeng/cmapitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/langitem.hxx> #include <editeng/nlbkitem.hxx> #include <editeng/nhypitem.hxx> #include <editeng/lcolitem.hxx> -#include <editeng/blnkitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/blinkitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/twolinesitem.hxx> #include <editeng/pbinitem.hxx> #include <editeng/sizeitem.hxx> @@ -52,18 +52,18 @@ #include <editeng/protitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> -#include <editeng/bolnitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/lineitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/orphitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/pmdlitem.hxx> #include <editeng/spltitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/charreliefitem.hxx> diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index 4bd6028f235c..b1315861e34c 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -27,7 +27,7 @@ #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/memberids.hrc> #include <svl/itempool.hxx> diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 749dad5c75d2..4e6a4141e53c 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -26,7 +26,7 @@ #include <svtools/grfmgr.hxx> #include <toolkit/unohlp.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/unoprnms.hxx> #include <editeng/numitem.hxx> #include <editeng/eeitem.hxx> diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 1661f6e0e967..71423732aff4 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -34,18 +34,18 @@ #include "formstrings.hxx" #include "fontitemids.hxx" #include <editeng/charreliefitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/colritem.hxx> #include <editeng/langitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/cmapitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> #include <editeng/flstitem.hxx> #include <svtools/ctrltool.hxx> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index dda08b44f75d..9cc9f06eb918 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -95,12 +95,12 @@ #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/fontitem.hxx> #include <editeng/colritem.hxx> #include <svx/sxekitm.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <svx/polysc3d.hxx> #include <svx/extrud3d.hxx> #include "svx/svditer.hxx" diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 208d8b50c50e..057f7e54bd07 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -51,7 +51,7 @@ #include "svx/xattr.hxx" #include "svx/svditext.hxx" #include <svx/svdetc.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <svx/polysc3d.hxx> #include <svx/extrud3d.hxx> #include <svx/svdoashp.hxx> @@ -60,14 +60,14 @@ #include <editeng/editids.hrc> #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() -#include <editeng/adjitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/colritem.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 <editeng/shdditem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/fontitem.hxx> @@ -85,7 +85,7 @@ #include <tools/zcodec.hxx> #include <filter/msfilter/svxmsbas.hxx> #include <sfx2/objsh.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/langitem.hxx> #include <svx/svdoole2.hxx> #include <svx/unoapi.hxx> diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index e4c8174fcf6e..0f3aec1b8283 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -28,11 +28,11 @@ #include <vcl/outdev.hxx> #define ITEMID_ADJUST EE_PARA_JUST -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #define ITEMID_WEIGHT EE_CHAR_WEIGHT #include <editeng/wghtitem.hxx> #define ITEMID_ESCAPEMENT EE_CHAR_ESCAPEMENT -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #define ITEMID_LINESPACING EE_PARA_SBL #include <editeng/lspcitem.hxx> #define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 01954e4aeebe..472bb30b15ed 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -101,7 +101,7 @@ #define ITEMID_LINEEND_LIST SID_LINEEND_LIST #include <svx/drawitem.hxx> #define ITEMID_BRUSH SID_ATTR_BRUSH -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <sfx2/docfilt.hxx> #include "dlgpage.hxx" diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 336894df2913..c0869d8cab08 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -40,25 +40,25 @@ #include <svx/algitem.hxx> #include <svx/svdpagv.hxx> #include <svx/xtable.hxx> // XColorList -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/fontitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/langitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/prszitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/flstitem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/colritem.hxx> #include <editeng/justifyitem.hxx> #include <svx/drawitem.hxx> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 79fb2890483f..6c51b8f0bad7 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -113,7 +113,7 @@ #include <editeng/sizeitem.hxx> #include <sfx2/zoomitem.hxx> #include <svx/zoomslideritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svx/flagsdef.hxx> #include <svx/svdpagv.hxx> #include <svx/svxdlg.hxx> diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index ef723e92bec4..40a8433178c8 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -30,7 +30,7 @@ #include <svx/svdpagv.hxx> #include <editeng/eeitemid.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/unoshape.hxx> #include <svx/gallery.hxx> diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index 1f698a45f11c..5af1d2bae034 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -38,13 +38,13 @@ **************************************************************************/ #include "scitems.hxx" -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/postitem.hxx> @@ -54,7 +54,7 @@ #include <editeng/justifyitem.hxx> #include <svx/rotmodit.hxx> #include <svl/intitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include "scdllapi.h" #include "global.hxx" #include "zforauto.hxx" diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index bc4f898a411b..31753abf2f96 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -17,7 +17,7 @@ #include "drawinglayer/primitive2d/baseprimitive2d.hxx" #include "drawinglayer/primitive2d/polypolygonprimitive2d.hxx" #include "editeng/editdata.hxx" -#include "editeng/escpitem.hxx" +#include "editeng/escapementitem.hxx" #include "editeng/fieldupdater.hxx" #include "editeng/outliner.hxx" #include "editeng/unoedsrc.hxx" @@ -447,24 +447,24 @@ #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <editeng/acorrcfg.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/akrnitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brkitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/formatbreakitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/charreliefitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <editeng/editobj.hxx> #include <editeng/editstat.hxx> #include <editeng/editview.hxx> #include <editeng/eeitem.hxx> -#include <editeng/emphitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/emphasismarkitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/flditem.hxx> #include <editeng/flstitem.hxx> @@ -473,7 +473,7 @@ #include <editeng/forbiddenruleitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/hngpnctitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/itemtype.hxx> #include <editeng/justifyitem.hxx> #include <editeng/langitem.hxx> diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 748922f6940c..7bec114321c6 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -45,7 +45,7 @@ #include "editeng/postitem.hxx" #include "editeng/udlnitem.hxx" #include "editeng/editobj.hxx" -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/justifyitem.hxx> #include <editeng/borderline.hxx> #include <dbdata.hxx> diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index c00c2b381c66..c450509394d8 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -20,7 +20,7 @@ #include "scitems.hxx" #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/shaditem.hxx> #include <editeng/editobj.hxx> diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index d2a5ee78e5fb..791ca24456c8 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -23,7 +23,7 @@ #include <svx/algitem.hxx> #include <editeng/editobj.hxx> #include <editeng/editstat.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <svx/rotmodit.hxx> diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 63ed640a78f3..8a4e870bf32a 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -27,14 +27,14 @@ #include <svl/stritem.hxx> #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/bolnitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/lineitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/charreliefitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <svx/dialmgr.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/forbiddenruleitem.hxx> diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index be1ea884f92c..b0214b1e571b 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -21,7 +21,7 @@ #include <editeng/eeitem.hxx> #include <sot/exchange.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <editeng/langitem.hxx> diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index be2518c0fae1..5121b5e2d4e1 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -20,7 +20,7 @@ #include "scitems.hxx" #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/justifyitem.hxx> #include <unotools/transliterationwrapper.hxx> diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 9c10c9cd7717..b43dd9908587 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -20,10 +20,10 @@ #include "scitems.hxx" #include <editeng/boxitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/editdata.hxx> // can be removed if table has a bLayoutRTL flag #include <editeng/shaditem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include "fillinfo.hxx" #include "document.hxx" diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 5f146c813a16..3a00dd5f9806 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -20,7 +20,7 @@ #include <vcl/svapp.hxx> #include "scitems.hxx" #include <svx/algitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/editobj.hxx> #include <editeng/scripttypeitem.hxx> #include <svl/srchitem.hxx> diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index ff5466e53907..c6a760080764 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -18,17 +18,17 @@ */ #include "scitems.hxx" -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/bolnitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/lineitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/charreliefitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <svtools/colorcfg.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/forbiddenruleitem.hxx> diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 4f172f7d469b..ce17027e7237 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -22,7 +22,7 @@ #include <i18npool/mslangid.hxx> #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <editeng/editobj.hxx> diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 674f212862c6..5c870c2708c7 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -21,10 +21,10 @@ #include <comphelper/string.hxx> #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/langitem.hxx> @@ -36,7 +36,7 @@ #include <editeng/editobj.hxx> #include <editeng/editeng.hxx> #include <editeng/eeitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <svl/zforlist.hxx> #include <vcl/keycodes.hxx> #include <rtl/math.hxx> diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index b8053731f187..aeb048fc6a55 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -25,7 +25,7 @@ #include <svtools/colorcfg.hxx> #include <editeng/editview.hxx> #include <editeng/editstat.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/flditem.hxx> #include <editeng/numitem.hxx> #include <editeng/justifyitem.hxx> diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 51eb967bcaa9..1d21113086be 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -37,7 +37,7 @@ #include <sfx2/docinf.hxx> #include <sfx2/frame.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <editeng/editobj.hxx> @@ -46,7 +46,7 @@ #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/flditem.hxx> #include <svx/xflclit.hxx> diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 5a78b3a77d2f..495465879ac8 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -37,13 +37,13 @@ #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svx/pageitem.hxx> #include <editeng/paperinf.hxx> #include <editeng/sizeitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <svl/intitem.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx index a6ff6066164b..4d51afb95e4f 100644 --- a/sc/source/filter/excel/fontbuff.cxx +++ b/sc/source/filter/excel/fontbuff.cxx @@ -21,12 +21,12 @@ #include "lotfntbf.hxx" #include "scitems.hxx" -#include <editeng/cntritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/eeitem.hxx> #include <editeng/postitem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> #include <sfx2/printer.hxx> diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 81e9ac2fa52a..301cef86641b 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -32,7 +32,7 @@ #include <editeng/colritem.hxx> #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/svxfont.hxx> #include "document.hxx" diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 81ff72ad09b1..c678691c10e2 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -27,7 +27,7 @@ #include <editeng/sizeitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include "document.hxx" #include "stlpool.hxx" #include "stlsheet.hxx" diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index ff39ed467d49..ac9ca175c152 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -32,13 +32,13 @@ #include "scitems.hxx" #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <svx/rotmodit.hxx> #include <editeng/colritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/eeitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/justifyitem.hxx> #include "document.hxx" #include "stlpool.hxx" diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index a455d89c462e..344cd85fb6e6 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -35,7 +35,7 @@ #include <editeng/udlnitem.hxx> #include <editeng/postitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include "stringutil.hxx" #include "document.hxx" #include "editutil.hxx" diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 3af643fb4d03..b4a131617286 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -73,7 +73,7 @@ #include <editeng/colritem.hxx> #include <svx/xflclit.hxx> #include <sal/macros.h> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/xlineit.hxx> #include <svx/xlinjoit.hxx> #include <svx/xlntrit.hxx> diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index 0e860a868da7..d472e4ed47e5 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -27,7 +27,7 @@ #include <editeng/sizeitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include "document.hxx" #include "stlsheet.hxx" #include "attrib.hxx" diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 8697f1c4eb24..63cb8396c9e5 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -28,16 +28,16 @@ #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/postitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <svx/rotmodit.hxx> #include <editeng/colritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/eeitem.hxx> #include <editeng/flstitem.hxx> diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx index ccad52256de7..14a590d93592 100644 --- a/sc/source/filter/excel/xlpage.cxx +++ b/sc/source/filter/excel/xlpage.cxx @@ -24,7 +24,7 @@ #include <vcl/svapp.hxx> #include <sal/macros.h> #include "scitems.hxx" -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include "global.hxx" #include "xlconst.hxx" #include <oox/core/xmlfilterbase.hxx> diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 6b93348afaf7..e6eb8a84d0cb 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -26,7 +26,7 @@ #include <vcl/svapp.hxx> #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/colritem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 8e8103ef49c2..717c1833324e 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -28,7 +28,7 @@ #include <svtools/htmlcfg.hxx> #include <svx/algitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/editeng.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index 0e8bb7aa30a1..bc17dff927d5 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.cxx @@ -23,7 +23,7 @@ #include <boost/bind.hpp> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/justifyitem.hxx> #include <svx/algitem.hxx> diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 3657f9bbe277..3eb94301518d 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -45,14 +45,14 @@ #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cntritem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/eeitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/bolnitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/lineitem.hxx> +#include <editeng/brushitem.hxx> #include <svx/rotmodit.hxx> #include <tools/fontenum.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sc/source/filter/qpro/qprostyle.cxx b/sc/source/filter/qpro/qprostyle.cxx index 765cdd3f2104..11ee06768e62 100644 --- a/sc/source/filter/qpro/qprostyle.cxx +++ b/sc/source/filter/qpro/qprostyle.cxx @@ -30,7 +30,7 @@ #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/justifyitem.hxx> diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 522ab3b0af91..5e3dd69c366c 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -21,10 +21,10 @@ #include <editeng/eeitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/editobj.hxx> #include <editeng/editview.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/langitem.hxx> #include <svx/svdograf.hxx> #include <svx/svdpage.hxx> diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index a8d1a5fb16fc..813039e54fda 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -22,9 +22,9 @@ #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <editeng/editobj.hxx> diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 1fdfc2ad329d..e3f8bafc7995 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -46,10 +46,10 @@ #include "scitems.hxx" #include <unotools/fltrcfg.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/frmdiritem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/eeitem.hxx> #include <filter/msfilter/msoleexp.hxx> diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index ba9f1da86160..def3a39d8988 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -68,15 +68,15 @@ #include "editeng/fontitem.hxx" #include "editeng/udlnitem.hxx" #include "editeng/wrlmitem.hxx" -#include "editeng/crsditem.hxx" +#include "editeng/crossedoutitem.hxx" #include "editeng/charreliefitem.hxx" #include "editeng/charscaleitem.hxx" -#include "editeng/cntritem.hxx" +#include "editeng/contouritem.hxx" #include "editeng/shdditem.hxx" #include "editeng/kernitem.hxx" -#include "editeng/akrnitem.hxx" -#include "editeng/escpitem.hxx" -#include "editeng/emphitem.hxx" +#include "editeng/autokernitem.hxx" +#include "editeng/escapementitem.hxx" +#include "editeng/emphasismarkitem.hxx" #include "editeng/langitem.hxx" #include <svx/unoapi.hxx> #include <svl/languageoptions.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index d885f7c45735..4dd5387721b6 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/XAccessibleTable.hpp> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <comphelper/sequence.hxx> #include <float.h> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 08ca4e620e72..0e7220ad3459 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 9bd2114ab747..f532a72492ff 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -29,7 +29,7 @@ #include "document.hxx" #include <svx/AccessibleTextHelper.hxx> #include <unotools/accessiblestatesethelper.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <toolkit/helper/convert.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 493a2054b87b..b190894f9aaf 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -38,7 +38,7 @@ #include <editeng/unoedhlp.hxx> #include <vcl/virdev.hxx> #include <editeng/editobj.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/justifyitem.hxx> #include <svx/svdmodel.hxx> #include <svx/algitem.hxx> diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 39ad15dd8492..6b5d3cb65232 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -23,14 +23,14 @@ #include <sfx2/app.hxx> #include <editeng/acorrcfg.hxx> #include <svx/algitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/brushitem.hxx> #include <svtools/colorcfg.hxx> #include <editeng/colritem.hxx> #include <editeng/editobj.hxx> #include <editeng/editstat.hxx> #include <editeng/editview.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <editeng/langitem.hxx> #include <editeng/svxacorr.hxx> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 79b71d8a5c8f..7a346b237181 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -24,7 +24,7 @@ #include <editeng/eeitem.hxx> #include <sfx2/app.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/editview.hxx> #include <editeng/editstat.hxx> #include <editeng/frmdiritem.hxx> diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index 338fe7fbc323..d48984391808 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -35,12 +35,12 @@ #include <editeng/postitem.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/zoomitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/colritem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <svl/ptitem.hxx> #include <editeng/sizeitem.hxx> #include <svx/algitem.hxx> @@ -73,9 +73,9 @@ #include <svx/grafctrl.hxx> #include <editeng/shdditem.hxx> #include <editeng/shaditem.hxx> -#include <editeng/cntritem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/charreliefitem.hxx> #include <svx/rotmodit.hxx> #include <svx/drawitem.hxx> diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index c2dd01731beb..944f853862c8 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -22,12 +22,12 @@ #include <comphelper/string.hxx> #include "scitems.hxx" -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/clipfmtitem.hxx> -#include <editeng/cntritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/editeng.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/flditem.hxx> #include <editeng/fontitem.hxx> #include <editeng/frmdiritem.hxx> diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index b00720cea0ad..37c9a2512329 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -21,8 +21,8 @@ #include <editeng/eeitem.hxx> #include <svx/svxdlg.hxx> -#include <editeng/brkitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/formatbreakitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/orphitem.hxx> #include <editeng/outliner.hxx> #include <editeng/spltitem.hxx> diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index a7c80b5fb622..dcf1b98531a3 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -19,7 +19,7 @@ #include "scitems.hxx" -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/drawitem.hxx> #include <svx/fontwork.hxx> #include <editeng/frmdiritem.hxx> diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 9199f04af347..fa4988c452ee 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -32,7 +32,7 @@ #include "tabvwsh.hxx" #include "sc.hrc" #include "drawview.hxx" -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <math.h> diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index bf3317716c5f..d0548dbcc151 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -20,10 +20,10 @@ #include "scitems.hxx" #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/postitem.hxx> #include <editeng/shdditem.hxx> diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 8f5d11c13999..e15b9b887c3c 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -27,10 +27,10 @@ #include "scitems.hxx" #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/postitem.hxx> #include <editeng/shdditem.hxx> diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index cd6699f02ddf..e7a9e3ac27cb 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -26,7 +26,7 @@ #include <editeng/editstat.hxx> #include <editeng/editview.hxx> #include <editeng/flditem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx> diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 669b3b6ba594..cbd100f308f3 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -23,7 +23,7 @@ #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/editeng.hxx> #include <editeng/flditem.hxx> #include <editeng/justifyitem.hxx> @@ -117,7 +117,7 @@ #include "formula/errorcodes.hxx" #include "unoreflist.hxx" #include "formula/grammar.hxx" -#include "editeng/escpitem.hxx" +#include "editeng/escapementitem.hxx" #include <list> #include <boost/scoped_ptr.hpp> diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index b24342ea3f21..4a9a1495d455 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -24,13 +24,13 @@ #include <svx/clipfmtitem.hxx> #include <svx/svxdlg.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/outliner.hxx> #include <editeng/unolingu.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/editeng.hxx> #include <editeng/editview.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/flditem.hxx> #include <editeng/fontitem.hxx> #include <svx/hlnkitem.hxx> diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 4a53e6a76a74..614cd919ebc2 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -46,9 +46,9 @@ #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/scripttypeitem.hxx> #include <svtools/colorcfg.hxx> diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 7bbbc1817ccf..ee963dc45637 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -21,7 +21,7 @@ #include "scitems.hxx" #include <memory> //auto_ptr -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/algitem.hxx> #include <editeng/editview.hxx> #include <editeng/editstat.hxx> diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 7ee1a91bfda7..c8018cf2131c 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -21,7 +21,7 @@ #include "scitems.hxx" #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/editdata.hxx> #include <svtools/colorcfg.hxx> #include "svtools/optionsdrawinglayer.hxx" diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 474043dee042..0158f17885d2 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -20,9 +20,9 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/algitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svtools/colorcfg.hxx> #include <editeng/colritem.hxx> #include <editeng/editobj.hxx> diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 092ef1646532..07a360f3b4ff 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -23,9 +23,9 @@ #include "printfun.hxx" #include <svx/svxids.hrc> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svtools/colorcfg.hxx> #include <editeng/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS #include <svx/fmview.hxx> diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 053d3a886925..c35ea9decf57 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -22,7 +22,7 @@ #include <editeng/eeitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/editview.hxx> #include <svx/fmshell.hxx> #include <svx/svdoole2.hxx> diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index f727b7562bc1..acc422f4baac 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -23,9 +23,9 @@ #include <sfx2/viewfrm.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/algitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svtools/colorcfg.hxx> #include <editeng/editview.hxx> #include <editeng/editstat.hxx> diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 2056f773a57f..390b32292b9f 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -366,17 +366,17 @@ #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <editeng/UnoForbiddenCharsTable.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/akrnitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/borderline.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/charreliefitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <editeng/editerr.hxx> @@ -385,8 +385,8 @@ #include <editeng/editund2.hxx> #include <editeng/editview.hxx> #include <editeng/eeitem.hxx> -#include <editeng/emphitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/emphasismarkitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/flditem.hxx> #include <editeng/flstitem.hxx> diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 2653807139e0..18a04bdd45fd 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -42,7 +42,7 @@ #include <svl/flagitem.hxx> #include <svx/svdoattr.hxx> #include <svx/svdotext.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/numitem.hxx> #include <svx/svditer.hxx> #include <editeng/unolingu.hxx> diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 4e5cf195f761..25a0c8da2246 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -32,17 +32,17 @@ #include <vcl/svapp.hxx> #include <eetext.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <svx/svxids.hrc> #include <svl/srchitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> // SVX_RESSTR -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <svx/xtable.hxx> #include <svx/sxmsuitm.hxx> #include <editeng/borderline.hxx> @@ -58,10 +58,10 @@ #include <editeng/fhgtitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/cntritem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/shdditem.hxx> #include <svx/xbtmpit.hxx> diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 7e1bf02ffb08..6bf39902fe18 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -29,7 +29,7 @@ #include <editeng/editdata.hxx> #include <svx/pageitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <svx/svdpagv.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/outlobj.hxx> @@ -41,7 +41,7 @@ #include <editeng/pbinitem.hxx> #include <svx/svdundo.hxx> #include <svl/smplhint.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/editobj.hxx> #include <editeng/scripttypeitem.hxx> #include <svx/unopage.hxx> diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 4b48d1ff45ad..26fb29928c57 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -22,9 +22,9 @@ #include <editeng/eeitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> @@ -34,21 +34,21 @@ #include <svx/xlineit0.hxx> #include <editeng/ulspitem.hxx> #include <editeng/numitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/editeng.hxx> #include <svl/smplhint.hxx> #include <editeng/langitem.hxx> #include <editeng/charreliefitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <svx/sdr/table/tabledesign.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <svx/svdattr.hxx> #include "eetext.hxx" #include <svx/xtable.hxx> // fuer RGB_Color -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svl/itempool.hxx> #include "stlpool.hxx" diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 0756e6b3c68b..09c85c3c83ac 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -38,7 +38,7 @@ #include <svx/sdr/properties/attributeproperties.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflbstit.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/lrspitem.hxx> #include <svx/unoshprp.hxx> #include <svx/unoshape.hxx> diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 13dfdedea473..69704ddfd9b0 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -23,9 +23,9 @@ #include <editeng/langitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> @@ -52,7 +52,7 @@ #include <svx/svdattr.hxx> #include <svx/grafctrl.hxx> #include <editeng/boxitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include "sdattr.hxx" #include <svx/zoomslideritem.hxx> #include <editeng/memberids.hrc> diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 4335dc0b448a..57dfb57fbe02 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -56,7 +56,7 @@ #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/postitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/flditem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/fcontnr.hxx> diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index ac3f1a564319..625f7a8108a1 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -40,9 +40,9 @@ #include <svx/xflgrit.hxx> #include <svx/xbtmpit.hxx> #include <svx/xlnclit.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/editeng.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/tstpitem.hxx> diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 359f7b337275..c91d358b5664 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -57,7 +57,7 @@ #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <svx/svdetc.hxx> diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index d217cbf5b68b..2a859f0b954d 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -21,14 +21,14 @@ #include <editeng/fontitem.hxx> #include <editeng/eeitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/flditem.hxx> #include <editeng/frmdir.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/langitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/editview.hxx> #include <svx/svdview.hxx> #include <svx/sdrpaintwindow.hxx> @@ -41,7 +41,7 @@ #include <editeng/outlobj.hxx> #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <svx/svxids.hrc> #include <svtools/langtab.hxx> #include <svl/slstitm.hxx> diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index f59ca5870c71..0eb5e02457ab 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -27,7 +27,7 @@ #include <svx/svxids.hrc> #include <sfx2/objsh.hxx> #include <svx/drawitem.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/eeitem.hxx> #include <editeng/numitem.hxx> diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 625c1915b9c3..f21ed9ec6108 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -30,9 +30,9 @@ #include <svx/drawitem.hxx> #include <svl/style.hxx> #include <svx/tabline.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/eeitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <vcl/graph.hxx> #include <editeng/lrspitem.hxx> #include <editeng/numitem.hxx> diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index acb6566d648a..0f58c1cd61f7 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -26,14 +26,14 @@ #include <editeng/fhgtitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/postitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> //<- Fonts & Items -#include <editeng/bulitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/bulletitem.hxx> +#include <editeng/brushitem.hxx> #include <vcl/graph.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 8c948c81fab4..8109f9a2c3f7 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -42,7 +42,7 @@ #include <svx/svdocirc.hxx> #include <svl/intitem.hxx> #include <sfx2/request.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/xtable.hxx> #include <svx/sdasitm.hxx> #include <svx/tbxcustomshapes.hxx> diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index beceb5ee9415..c4e7afd0d034 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -42,7 +42,7 @@ #include <svx/svdocirc.hxx> #include <svl/intitem.hxx> #include <sfx2/request.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/xtable.hxx> #include <svx/svdocapt.hxx> diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 80f57490d7bd..2c2c845f9837 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -24,7 +24,7 @@ #include "futempl.hxx" #include <editeng/editdata.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <svx/svxids.hrc> // fuer SID_OBJECT_SELECT #include <sfx2/bindings.hxx> #include <svl/aeitem.hxx> diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 8a0a9770fe2f..d8d1d66d448f 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -31,7 +31,7 @@ #include <svx/svdorect.hxx> #include <svl/poolitem.hxx> #include <editeng/eeitem.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <svl/itempool.hxx> #include <editeng/numitem.hxx> #include <svl/whiter.hxx> diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index ce9fbeabfd70..a32b922ed3a2 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -25,7 +25,7 @@ #include <i18npool/mslangid.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/editview.hxx> #include <editeng/editeng.hxx> #include <editeng/outliner.hxx> @@ -38,7 +38,7 @@ #include <svl/style.hxx> #include <svl/languageoptions.hxx> #include <sfx2/tplpitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <svx/svdoutl.hxx> #include <svl/intitem.hxx> #include <editeng/scripttypeitem.hxx> diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 46bb8e35360b..7d92552cf5a0 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -27,7 +27,7 @@ #include <editeng/outliner.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <vcl/vclenum.hxx> #include <sfx2/app.hxx> #include <svl/whiter.hxx> @@ -37,12 +37,12 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> #include <svx/xtable.hxx> #include <svx/svdobj.hxx> diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index ff1db686eb06..fde0aae0360b 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -39,7 +39,7 @@ #include <svx/svdundo.hxx> #include <svl/brdcst.hxx> #include <vcl/msgbox.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/numitem.hxx> diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index d40ecb0cdfa3..c240dca27612 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -51,18 +51,18 @@ #include <editeng/fontitem.hxx> // SvxFontItem #include <editeng/postitem.hxx> // SvxPostureItem #include <editeng/udlnitem.hxx> // SvxUnderlineItem -#include <editeng/crsditem.hxx> // SvxCrossedOutItem -#include <editeng/cntritem.hxx> // SvxContourItem +#include <editeng/crossedoutitem.hxx> // SvxCrossedOutItem +#include <editeng/contouritem.hxx> // SvxContourItem #include <editeng/wghtitem.hxx> // SvxWeightItem #include <editeng/fhgtitem.hxx> // SvxFontHeightItem #include <editeng/shdditem.hxx> // SvxShadowedItem -#include <editeng/escpitem.hxx> // SvxEscapementItem +#include <editeng/escapementitem.hxx> // SvxEscapementItem #include <editeng/wrlmitem.hxx> // SvxWordLineModeItem #include <editeng/cmapitem.hxx> // SvxWordLineModeItem #include <editeng/kernitem.hxx> // SvxKerningItem -#include <editeng/brshitem.hxx> // SvxBrushItem +#include <editeng/brushitem.hxx> // SvxBrushItem #include <editeng/colritem.hxx> // SvxColorItem -#include <editeng/emphitem.hxx> // SvxEmphasisMarkItem +#include <editeng/emphasismarkitem.hxx> // SvxEmphasisMarkItem #include <editeng/charreliefitem.hxx> // SvxCharReliefItem #include <editeng/twolinesitem.hxx> // SvxTwoLinesItem #include <editeng/charscaleitem.hxx> // SvxCharScaleWidthItem diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 28833813d21f..55a215125aae 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -40,7 +40,7 @@ #include <svx/dialmgr.hxx> #include "svx/htmlmode.hxx" -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/shaditem.hxx> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index cc4e7e4ebed8..4f10f61f44c3 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -62,7 +62,7 @@ #include "srchctrl.hxx" #include <svx/dialmgr.hxx> #include "svx/dlgutil.hxx" -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <tools/resary.hxx> #include <svx/svxdlg.hxx> diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index c4d7dac76e9a..cc160a744067 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -29,7 +29,7 @@ #include <vcl/svapp.hxx> #include <svx/gallery.hxx> #include <svl/urihelper.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <vcl/graph.hxx> diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index a4551afbae70..32195c121280 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -23,7 +23,7 @@ #include "fmtextcontroldialogs.hxx" #include "fmtextcontrolfeature.hxx" #include "fmtextcontrolshell.hxx" -#include "editeng/crsditem.hxx" +#include "editeng/crossedoutitem.hxx" #include "svx/dialmgr.hxx" #include "editeng/editeng.hxx" #include "editeng/eeitem.hxx" diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index e1a9d3bd1e8d..d65f431764c4 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -23,27 +23,27 @@ #include <svl/intitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> #include <editeng/postitem.hxx> #include "svx/clipfmtitem.hxx" #include <editeng/fhgtitem.hxx> #include "editeng/fontitem.hxx" #include <editeng/charreliefitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/colritem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/charscaleitem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/langitem.hxx> #include <editeng/kernitem.hxx> #include <editeng/tstpitem.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/memberids.hrc> #define SFX_TYPEMAP diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 2111eed07173..8577703e6a60 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -31,7 +31,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/sfxsids.hrc> #include <vcl/graphicfilter.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include "helpid.hrc" #include "svx/gallery.hxx" #include "galobj.hxx" diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index e4eb5cd272ed..4803bbcc2096 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -29,7 +29,7 @@ #include <svx/svdmodel.hxx> #include <editeng/outlobj.hxx> #include <svx/xflclit.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/svdetc.hxx> #include <editeng/editeng.hxx> #include <editeng/flditem.hxx> diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index fe533855537f..77ea5361474d 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -48,7 +48,7 @@ #include "svx/svdglob.hxx" // string cache #include "svx/svdstr.hrc" #include <svx/sdgcpitm.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/sdtfchim.hxx> #include <editeng/writingmodeitem.hxx> #include <tools/bigint.hxx> @@ -67,7 +67,7 @@ #include "editeng/shaditem.hxx" #define ITEMID_LINE 0 -#include "editeng/bolnitem.hxx" +#include "editeng/lineitem.hxx" using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index f047b7839959..a08604e761a3 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -58,7 +58,7 @@ #include "svx/svdglob.hxx" // StringCache #include "svx/globl3d.hxx" #include <editeng/outliner.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svtools/colorcfg.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 6e7b7f4dfabb..7e38fc6e5f22 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -27,7 +27,7 @@ #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> #include <svx/xlnclit.hxx> #include <svx/xlncapit.hxx> @@ -36,9 +36,9 @@ #include <svx/xgrad.hxx> #include <svx/xflgrit.hxx> #include <editeng/fontitem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/wrlmitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> #include <vcl/metric.hxx> #include <editeng/charscaleitem.hxx> diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 01abfb7c9bca..6bddfb35b37d 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -73,7 +73,7 @@ #include <editeng/fhgtitem.hxx> #include <svl/style.hxx> #include <editeng/numitem.hxx> -#include <editeng/bulitem.hxx> +#include <editeng/bulletitem.hxx> #include <editeng/outlobj.hxx> #include "editeng/forbiddencharacterstable.hxx" #include <svl/zforlist.hxx> diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index a629c2cd59c1..6607c13b01f2 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -60,7 +60,7 @@ #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> #include <svx/xlnedcit.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <svx/xflbckit.hxx> #include <svx/xtable.hxx> #include <svx/xbtmpit.hxx> diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 72ab07f745fa..feafda5c8157 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -39,7 +39,7 @@ #include <editeng/outliner.hxx> #include <editeng/fhgtitem.hxx> #include <svl/itempool.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/flditem.hxx> #include <svx/xftouit.hxx> #include <tools/helpers.hxx> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 282fa9517bea..0d53e44dc353 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -35,7 +35,7 @@ #include <basegfx/color/bcolor.hxx> #include <vcl/svapp.hxx> #include <editeng/eeitemid.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/svxenum.hxx> #include <editeng/flditem.hxx> #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index e0a7ce70d8a8..ff6037ca77e6 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -55,7 +55,7 @@ #include "cell.hxx" #include <editeng/borderline.hxx> #include <editeng/colritem.hxx> -#include "editeng/bolnitem.hxx" +#include "editeng/lineitem.hxx" #include "svx/svdstr.hrc" #include "svx/svdglob.hxx" #include "svx/svdpage.hxx" diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index beddeedfeb9d..8e23dc80ed34 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -38,7 +38,7 @@ #include <svx/svxids.hrc> #include "grafctrl.hrc" #include <svx/dialogs.hrc> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/sizeitem.hxx> #include <svx/sdgcpitm.hxx> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index d827854bdb5d..89d73d1639da 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -60,15 +60,15 @@ #include <svx/xtable.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/charreliefitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/emphitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/emphasismarkitem.hxx> #include <editeng/flstitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/postitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/udlnitem.hxx> diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index 91fc5d6c80f0..eff9f1d70787 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -53,18 +53,18 @@ // SVX #include <editeng/lrspitem.hxx> #include <editeng/shdditem.hxx> -#include <editeng/cntritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/lspcitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/akrnitem.hxx> +#include <editeng/autokernitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/colritem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/postitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 0e12398863dd..02f659c57382 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -26,7 +26,7 @@ #include <swatrset.hxx> #include <format.hxx> #include <swtypes.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/adjustitem.hxx> class SwCharFmt; class IntlWrapper; diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 6e00ee92b3b0..fbcef59a8f58 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -81,32 +81,32 @@ #include <cstdio> #include <cstring> #include <ctype.h> -#include <editeng/adjitem.hxx> -#include <editeng/akrnitem.hxx> -#include <editeng/blnkitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brkitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/formatbreakitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/charhiddenitem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/cmapitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> +#include <editeng/crossedoutitem.hxx> #include <editeng/editeng.hxx> #include <editeng/editobj.hxx> #include <editeng/eeitem.hxx> -#include <editeng/emphitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/emphasismarkitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/flditem.hxx> #include <editeng/fontitem.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/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 436244530e10..0e054be07eed 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -478,22 +478,22 @@ #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <editeng/SpellPortions.hxx> #include <editeng/acorrcfg.hxx> -#include <editeng/adjitem.hxx> -#include <editeng/akrnitem.hxx> -#include <editeng/blnkitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/adjustitem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/blinkitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brkitem.hxx> -#include <editeng/brshitem.hxx> +#include <editeng/formatbreakitem.hxx> +#include <editeng/brushitem.hxx> #include <editeng/charhiddenitem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/cmapitem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cscoitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/charsetcoloritem.hxx> #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <editeng/editerr.hxx> @@ -501,8 +501,8 @@ #include <editeng/editstat.hxx> #include <editeng/editview.hxx> #include <editeng/eeitem.hxx> -#include <editeng/emphitem.hxx> -#include <editeng/escpitem.hxx> +#include <editeng/emphasismarkitem.hxx> +#include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/flditem.hxx> #include <editeng/flstitem.hxx> @@ -512,7 +512,7 @@ #include <editeng/frmdiritem.hxx> #include <editeng/hangulhanja.hxx> #include <editeng/hngpnctitem.hxx> -#include <editeng/hyznitem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/itemtype.hxx> #include <editeng/keepitem.hxx> #include <editeng/kernitem.hxx> diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 029d4447095e..734042741a49 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -37,21 +37,21 @@ #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/udlnitem.hxx> -#include <editeng/crsditem.hxx> -#include <editeng/cntritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> #include <editeng/colritem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brshitem.hxx> -#include <editeng/adjitem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/adjustitem.hxx> #include <editeng/justifyitem.hxx> -#include <editeng/brkitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/shaditem.hxx> #include <svx/rotmodit.hxx> #include <svl/intitem.hxx> -#include <editeng/bolnitem.hxx> +#include <editeng/lineitem.hxx> #include <fmtpdsc.hxx> #include <fmtlsplt.hxx> #include <fmtrowsplt.hxx> 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> |