[Libreoffice-commits] core.git: chart2/source cui/source editeng/inc editeng/Package_inc.mk editeng/source extensions/source filter/source forms/source reportdesign/source sc/inc sc/qa sc/source sd/inc sd/source svx/source svx/workben sw/inc sw/source
Kohei Yoshida
kohei.yoshida at gmail.com
Tue Feb 12 12:16:05 PST 2013
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 2
chart2/source/controller/main/DrawCommandDispatch.cxx | 2
chart2/source/controller/main/ShapeController.cxx | 4
chart2/source/view/main/ChartItemPool.cxx | 2
cui/source/options/cuisrchdlg.cxx | 2
cui/source/tabpages/backgrnd.cxx | 2
cui/source/tabpages/borderconn.cxx | 2
cui/source/tabpages/chardlg.cxx | 14
cui/source/tabpages/grfpage.cxx | 2
cui/source/tabpages/numpages.cxx | 2
cui/source/tabpages/page.cxx | 2
cui/source/tabpages/paragrph.cxx | 6
cui/source/tabpages/tpline.cxx | 2
editeng/Package_inc.mk | 26 -
editeng/inc/editeng/adjitem.hxx | 134 ---------
editeng/inc/editeng/adjustitem.hxx | 134 +++++++++
editeng/inc/editeng/akrnitem.hxx | 65 ----
editeng/inc/editeng/autokernitem.hxx | 65 ++++
editeng/inc/editeng/blinkitem.hxx | 63 ++++
editeng/inc/editeng/blnkitem.hxx | 63 ----
editeng/inc/editeng/bolnitem.hxx | 75 -----
editeng/inc/editeng/brkitem.hxx | 94 ------
editeng/inc/editeng/brshitem.hxx | 129 --------
editeng/inc/editeng/brushitem.hxx | 129 ++++++++
editeng/inc/editeng/bulitem.hxx | 146 ----------
editeng/inc/editeng/bulletitem.hxx | 146 ++++++++++
editeng/inc/editeng/charsetcoloritem.hxx | 66 ++++
editeng/inc/editeng/cntritem.hxx | 58 ---
editeng/inc/editeng/contouritem.hxx | 58 +++
editeng/inc/editeng/crossedoutitem.hxx | 83 +++++
editeng/inc/editeng/crsditem.hxx | 83 -----
editeng/inc/editeng/cscoitem.hxx | 66 ----
editeng/inc/editeng/emphasismarkitem.hxx | 77 +++++
editeng/inc/editeng/emphitem.hxx | 77 -----
editeng/inc/editeng/escapementitem.hxx | 105 +++++++
editeng/inc/editeng/escpitem.hxx | 105 -------
editeng/inc/editeng/formatbreakitem.hxx | 94 ++++++
editeng/inc/editeng/hyphenzoneitem.hxx | 97 ++++++
editeng/inc/editeng/hyznitem.hxx | 97 ------
editeng/inc/editeng/lineitem.hxx | 75 +++++
editeng/source/editeng/editattr.cxx | 12
editeng/source/editeng/editdbg.cxx | 12
editeng/source/editeng/editdoc.cxx | 12
editeng/source/editeng/editeng.cxx | 16 -
editeng/source/editeng/editobj.cxx | 6
editeng/source/editeng/eehtml.cxx | 2
editeng/source/editeng/eerdll.cxx | 16 -
editeng/source/editeng/eertfpar.cxx | 2
editeng/source/editeng/impedit2.cxx | 2
editeng/source/editeng/impedit3.cxx | 4
editeng/source/editeng/impedit4.cxx | 12
editeng/source/items/bulitem.cxx | 2
editeng/source/items/frmitems.cxx | 6
editeng/source/items/numitem.cxx | 2
editeng/source/items/paraitem.cxx | 4
editeng/source/items/svxfont.cxx | 2
editeng/source/items/textitem.cxx | 14
editeng/source/misc/svxacorr.cxx | 2
editeng/source/outliner/outliner.cxx | 4
editeng/source/rtf/rtfitem.cxx | 24 -
editeng/source/uno/unofdesc.cxx | 2
editeng/source/uno/unonrule.cxx | 2
extensions/source/propctrlr/fontdialog.cxx | 6
filter/source/msfilter/msdffimp.cxx | 4
filter/source/msfilter/svdfppt.cxx | 10
forms/source/richtext/rtattributehandler.cxx | 4
reportdesign/source/ui/inspection/GeometryHandler.cxx | 2
reportdesign/source/ui/misc/UITools.cxx | 14
reportdesign/source/ui/report/ReportController.cxx | 2
reportdesign/source/ui/report/ReportSection.cxx | 2
sc/inc/autoform.hxx | 10
sc/inc/pch/precompiled_sc.hxx | 22 -
sc/qa/unit/subsequent_filters-test.cxx | 2
sc/source/core/data/attarray.cxx | 2
sc/source/core/data/column2.cxx | 2
sc/source/core/data/docpool.cxx | 10
sc/source/core/data/documen9.cxx | 2
sc/source/core/data/dpoutput.cxx | 2
sc/source/core/data/fillinfo.cxx | 4
sc/source/core/data/global.cxx | 2
sc/source/core/data/patattr.cxx | 12
sc/source/core/data/stlpool.cxx | 2
sc/source/core/data/table4.cxx | 8
sc/source/core/tool/editutil.cxx | 2
sc/source/filter/excel/excimp8.cxx | 4
sc/source/filter/excel/excrecds.cxx | 4
sc/source/filter/excel/fontbuff.cxx | 6
sc/source/filter/excel/xehelper.cxx | 2
sc/source/filter/excel/xepage.cxx | 2
sc/source/filter/excel/xestyle.cxx | 6
sc/source/filter/excel/xicontent.cxx | 2
sc/source/filter/excel/xiescher.cxx | 2
sc/source/filter/excel/xipage.cxx | 2
sc/source/filter/excel/xistyle.cxx | 10
sc/source/filter/excel/xlpage.cxx | 2
sc/source/filter/html/htmlexp.cxx | 2
sc/source/filter/html/htmlpars.cxx | 2
sc/source/filter/lotus/lotattr.cxx | 2
sc/source/filter/oox/stylesbuffer.cxx | 10
sc/source/filter/qpro/qprostyle.cxx | 2
sc/source/filter/rtf/eeimpars.cxx | 4
sc/source/filter/starcalc/scflt.cxx | 4
sc/source/filter/xcl97/xcl97rec.cxx | 4
sc/source/filter/xml/xmlcelli.cxx | 10
sc/source/ui/Accessibility/AccessibleCell.cxx | 2
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 2
sc/source/ui/Accessibility/AccessibleText.cxx | 2
sc/source/ui/app/inputhdl.cxx | 6
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/app/typemap.cxx | 10
sc/source/ui/drawfunc/drtxtob.cxx | 8
sc/source/ui/drawfunc/drtxtob1.cxx | 4
sc/source/ui/drawfunc/drtxtob2.cxx | 2
sc/source/ui/drawfunc/fuconcustomshape.cxx | 2
sc/source/ui/miscdlgs/autofmt.cxx | 6
sc/source/ui/miscdlgs/scuiautofmt.cxx | 6
sc/source/ui/pagedlg/tphfedit.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 4
sc/source/ui/view/editsh.cxx | 6
sc/source/ui/view/formatsh.cxx | 4
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/output.cxx | 2
sc/source/ui/view/output2.cxx | 4
sc/source/ui/view/printfun.cxx | 4
sc/source/ui/view/tabview3.cxx | 2
sc/source/ui/view/viewdata.cxx | 4
sd/inc/pch/precompiled_sd.hxx | 18 -
sd/source/core/drawdoc.cxx | 2
sd/source/core/drawdoc4.cxx | 12
sd/source/core/sdpage.cxx | 4
sd/source/core/stlpool.cxx | 14
sd/source/core/stlsheet.cxx | 2
sd/source/core/typemap.cxx | 6
sd/source/filter/html/htmlex.cxx | 2
sd/source/filter/ppt/pptin.cxx | 4
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/annotations/annotationwindow.cxx | 6
sd/source/ui/dlg/dlgolbul.cxx | 2
sd/source/ui/dlg/prltempl.cxx | 4
sd/source/ui/func/bulmaper.cxx | 8
sd/source/ui/func/fuconcs.cxx | 2
sd/source/ui/func/fuconrec.cxx | 2
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/view/drawview.cxx | 2
sd/source/ui/view/drtxtob.cxx | 4
sd/source/ui/view/drtxtob1.cxx | 8
sd/source/ui/view/outlview.cxx | 2
svx/source/dialog/fntctrl.cxx | 10
svx/source/dialog/hdft.cxx | 2
svx/source/dialog/srchdlg.cxx | 2
svx/source/dialog/svxbmpnumvalueset.cxx | 2
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/form/typemap.cxx | 12
svx/source/gallery2/galbrws2.cxx | 2
svx/source/sdr/properties/textproperties.cxx | 2
svx/source/svdraw/svdattr.cxx | 4
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdfmtf.cxx | 6
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdoattr.cxx | 2
svx/source/svdraw/svdotext.cxx | 2
svx/source/svdraw/svdotextdecomposition.cxx | 2
svx/source/table/tablecontroller.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 10
svx/workben/edittest.cxx | 10
sw/inc/paratr.hxx | 2
sw/inc/pch/precompiled_msword.hxx | 20 -
sw/inc/pch/precompiled_sw.hxx | 24 -
sw/inc/tblafmt.hxx | 12
sw/source/core/access/accframe.cxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/attr/swatrset.cxx | 4
sw/source/core/bastyp/init.cxx | 14
sw/source/core/crsr/crstrvl.cxx | 4
sw/source/core/crsr/findattr.cxx | 2
sw/source/core/doc/doc.cxx | 4
sw/source/core/doc/doccomp.cxx | 2
sw/source/core/doc/docfmt.cxx | 2
sw/source/core/doc/docnum.cxx | 2
sw/source/core/doc/docredln.cxx | 2
sw/source/core/doc/doctxm.cxx | 2
sw/source/core/doc/number.cxx | 2
sw/source/core/doc/poolfmt.cxx | 6
sw/source/core/doc/tblrwcl.cxx | 2
sw/source/core/docnode/ndcopy.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/docnode/ndtbl1.cxx | 2
sw/source/core/edit/autofmt.cxx | 6
sw/source/core/edit/edfcol.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/frmedt/fetab.cxx | 2
sw/source/core/layout/atrfrm.cxx | 2
sw/source/core/layout/flowfrm.cxx | 2
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/layout/layact.cxx | 2
sw/source/core/layout/laycache.cxx | 2
sw/source/core/layout/pagedesc.cxx | 2
sw/source/core/layout/paintfrm.cxx | 2
sw/source/core/layout/sectfrm.cxx | 2
sw/source/core/layout/tabfrm.cxx | 2
sw/source/core/layout/wsfrm.cxx | 4
sw/source/core/table/swtable.cxx | 2
sw/source/core/text/EnhancedPDFExportHelper.cxx | 2
sw/source/core/text/atrstck.cxx | 14
sw/source/core/text/frmform.cxx | 2
sw/source/core/text/inftxt.cxx | 6
sw/source/core/text/itrcrsr.cxx | 2
sw/source/core/text/itrpaint.cxx | 2
sw/source/core/text/porfld.cxx | 2
sw/source/core/text/porlay.cxx | 4
sw/source/core/text/porrst.cxx | 4
sw/source/core/text/txtfrm.cxx | 2
sw/source/core/text/txtftn.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 4
sw/source/core/txtnode/swfont.cxx | 16 -
sw/source/core/txtnode/thints.cxx | 2
sw/source/core/undo/rolbck.cxx | 2
sw/source/core/undo/undel.cxx | 2
sw/source/core/undo/unspnd.cxx | 2
sw/source/core/undo/untbl.cxx | 2
sw/source/core/unocore/unoframe.cxx | 2
sw/source/core/unocore/unoobj.cxx | 2
sw/source/core/unocore/unoobj2.cxx | 2
sw/source/core/unocore/unosect.cxx | 2
sw/source/core/unocore/unosett.cxx | 2
sw/source/core/unocore/unostyle.cxx | 2
sw/source/core/unocore/unotbl.cxx | 2
sw/source/filter/ascii/parasc.cxx | 2
sw/source/filter/html/css1atr.cxx | 10
sw/source/filter/html/htmlatr.cxx | 12
sw/source/filter/html/htmlcss1.cxx | 4
sw/source/filter/html/htmlctxt.cxx | 2
sw/source/filter/html/htmldraw.cxx | 2
sw/source/filter/html/htmlfly.cxx | 2
sw/source/filter/html/htmlform.cxx | 4
sw/source/filter/html/htmlforw.cxx | 4
sw/source/filter/html/htmlgrin.cxx | 4
sw/source/filter/html/htmlnum.cxx | 2
sw/source/filter/html/htmlsect.cxx | 4
sw/source/filter/html/htmltab.cxx | 6
sw/source/filter/html/htmltabw.cxx | 2
sw/source/filter/html/svxcss1.cxx | 8
sw/source/filter/html/swhtml.cxx | 10
sw/source/filter/html/wrthtml.cxx | 2
sw/source/filter/inc/fltshell.hxx | 2
sw/source/filter/writer/wrtswtbl.cxx | 2
sw/source/filter/ww1/fltshell.cxx | 4
sw/source/filter/ww1/w1filter.cxx | 6
sw/source/filter/ww1/w1sprm.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 14
sw/source/filter/ww8/rtfattributeoutput.cxx | 18 -
sw/source/filter/ww8/rtfexport.cxx | 2
sw/source/filter/ww8/writerhelper.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 4
sw/source/filter/ww8/wrtww8.cxx | 4
sw/source/filter/ww8/ww8atr.cxx | 20 -
sw/source/filter/ww8/ww8graf.cxx | 8
sw/source/filter/ww8/ww8par2.cxx | 4
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 18 -
sw/source/filter/xml/xmlbrsh.cxx | 2
sw/source/filter/xml/xmlexpit.cxx | 4
sw/source/filter/xml/xmlimpit.cxx | 4
sw/source/filter/xml/xmliteme.cxx | 2
sw/source/filter/xml/xmlitemi.cxx | 2
sw/source/filter/xml/xmlithlp.cxx | 4
sw/source/filter/xml/xmlithlp.hxx | 2
sw/source/filter/xml/xmltble.cxx | 2
sw/source/ui/app/appenv.cxx | 2
sw/source/ui/app/appopt.cxx | 2
sw/source/ui/app/docsh.cxx | 2
sw/source/ui/app/docshini.cxx | 6
sw/source/ui/app/docst.cxx | 2
sw/source/ui/app/swmodul1.cxx | 4
sw/source/ui/config/uinums.cxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 2
sw/source/ui/dochdl/gloshdl.cxx | 2
sw/source/ui/docvw/PageBreakWin.cxx | 2
sw/source/ui/docvw/edtwin.cxx | 2
sw/source/ui/docvw/romenu.cxx | 2
sw/source/ui/envelp/envfmt.cxx | 2
sw/source/ui/frmdlg/colex.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 2
sw/source/ui/inc/regionsw.hxx | 2
sw/source/ui/lingu/olmenu.cxx | 2
sw/source/ui/misc/num.cxx | 2
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/ribbar/concustomshape.cxx | 2
sw/source/ui/shells/annotsh.cxx | 12
sw/source/ui/shells/basesh.cxx | 2
sw/source/ui/shells/drwtxtex.cxx | 12
sw/source/ui/shells/frmsh.cxx | 2
sw/source/ui/shells/grfsh.cxx | 2
sw/source/ui/shells/listsh.cxx | 2
sw/source/ui/shells/mediash.cxx | 2
sw/source/ui/shells/slotadd.cxx | 20 -
sw/source/ui/shells/tabsh.cxx | 4
sw/source/ui/shells/textsh.cxx | 2
sw/source/ui/shells/textsh1.cxx | 2
sw/source/ui/shells/txtattr.cxx | 4
sw/source/ui/shells/txtnum.cxx | 2
sw/source/ui/table/swtablerep.cxx | 2
sw/source/ui/table/tabledlg.cxx | 2
sw/source/ui/uiview/formatclipboard.cxx | 4
sw/source/ui/uiview/viewstat.cxx | 2
sw/source/ui/wrtsh/wrtsh1.cxx | 2
311 files changed, 1840 insertions(+), 1840 deletions(-)
New commits:
commit 1aaf9a9b362188eb706eae2b6b93df35266047d3
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Feb 12 13:41:53 2013 -0500
Renamed hard-to-remember 8-char headers in editeng.
Change-Id: If255802082890e1b1b4c5197a791fa79a011773e
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 1550998..6575587 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 148743e..f2a0423 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 1820e80..6ab29b3 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 a8ce682..49c94d5 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 8847ffa..fdf6a3f 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 cfc5b98..f1c6947 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 fdeb7bc..b5c2f63 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 1365ded..8fd5dae 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 fd3829d..7622e9d4 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 1d3694b..8e4a46c 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 8e9fc4a..252e57e 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 81bdbb3..be4ed9e 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 693012c..673e1dc 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 b9e77b0..f79505e 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 2978ec1..4794507 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/adjitem.hxx
deleted file mode 100644
index 64eceaf..0000000
--- a/editeng/inc/editeng/adjitem.hxx
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_ADJITEM_HXX
-#define _SVX_ADJITEM_HXX
-
-#include <svl/eitem.hxx>
-#include <editeng/svxenum.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/editengdllapi.h>
-
-class SvXMLUnitConverter;
-namespace rtl
-{
- class OUString;
-}
-
-// class SvxAdjustItem ---------------------------------------------------
-
-/*
-[Description]
-This item describes the row orientation.
-*/
-#define ADJUST_LASTBLOCK_VERSION ((sal_uInt16)0x0001)
-
-class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
-{
- sal_Bool bLeft : 1;
- sal_Bool bRight : 1;
- sal_Bool bCenter : 1;
- sal_Bool bBlock : 1;
-
- // only activ when bBlock
- sal_Bool bOneBlock : 1;
- sal_Bool bLastCenter : 1;
- sal_Bool bLastBlock : 1;
-
- friend SvStream& operator<<( SvStream&, SvxAdjustItem& ); //$ ostream
-public:
- TYPEINFO();
-
- SvxAdjustItem( const SvxAdjust eAdjst /*= SVX_ADJUST_LEFT*/,
- const sal_uInt16 nId );
-
- // "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
-
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
-
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
- virtual sal_uInt16 GetValueCount() const;
- virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetEnumValue() const;
- virtual void SetEnumValue( sal_uInt16 nNewVal );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
- virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
-
- inline void SetOneWord( const SvxAdjust eType )
- {
- bOneBlock = eType == SVX_ADJUST_BLOCK;
- }
-
- inline void SetLastBlock( const SvxAdjust eType )
- {
- bLastBlock = eType == SVX_ADJUST_BLOCK;
- bLastCenter = eType == SVX_ADJUST_CENTER;
- }
-
- inline void SetAdjust( const SvxAdjust eType )
- {
- bLeft = eType == SVX_ADJUST_LEFT;
- bRight = eType == SVX_ADJUST_RIGHT;
- bCenter = eType == SVX_ADJUST_CENTER;
- bBlock = eType == SVX_ADJUST_BLOCK;
- }
-
- inline SvxAdjust GetLastBlock() const
- {
- SvxAdjust eRet = SVX_ADJUST_LEFT;
-
- if ( bLastBlock )
- eRet = SVX_ADJUST_BLOCK;
- else if( bLastCenter )
- eRet = SVX_ADJUST_CENTER;
- return eRet;
- }
-
- inline SvxAdjust GetOneWord() const
- {
- SvxAdjust eRet = SVX_ADJUST_LEFT;
-
- if ( bBlock && bOneBlock )
- eRet = SVX_ADJUST_BLOCK;
- return eRet;
- }
-
- inline SvxAdjust GetAdjust() const
- {
- SvxAdjust eRet = SVX_ADJUST_LEFT;
-
- if ( bRight )
- eRet = SVX_ADJUST_RIGHT;
- else if ( bCenter )
- eRet = SVX_ADJUST_CENTER;
- else if ( bBlock )
- eRet = SVX_ADJUST_BLOCK;
- return eRet;
- }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/adjustitem.hxx b/editeng/inc/editeng/adjustitem.hxx
new file mode 100644
index 0000000..64eceaf
--- /dev/null
+++ b/editeng/inc/editeng/adjustitem.hxx
@@ -0,0 +1,134 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_ADJITEM_HXX
+#define _SVX_ADJITEM_HXX
+
+#include <svl/eitem.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editengdllapi.h>
+
+class SvXMLUnitConverter;
+namespace rtl
+{
+ class OUString;
+}
+
+// class SvxAdjustItem ---------------------------------------------------
+
+/*
+[Description]
+This item describes the row orientation.
+*/
+#define ADJUST_LASTBLOCK_VERSION ((sal_uInt16)0x0001)
+
+class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
+{
+ sal_Bool bLeft : 1;
+ sal_Bool bRight : 1;
+ sal_Bool bCenter : 1;
+ sal_Bool bBlock : 1;
+
+ // only activ when bBlock
+ sal_Bool bOneBlock : 1;
+ sal_Bool bLastCenter : 1;
+ sal_Bool bLastBlock : 1;
+
+ friend SvStream& operator<<( SvStream&, SvxAdjustItem& ); //$ ostream
+public:
+ TYPEINFO();
+
+ SvxAdjustItem( const SvxAdjust eAdjst /*= SVX_ADJUST_LEFT*/,
+ const sal_uInt16 nId );
+
+ // "pure virtual Methods" from SfxPoolItem
+ virtual int operator==( const SfxPoolItem& ) const;
+
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = 0 ) const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetEnumValue() const;
+ virtual void SetEnumValue( sal_uInt16 nNewVal );
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
+
+ inline void SetOneWord( const SvxAdjust eType )
+ {
+ bOneBlock = eType == SVX_ADJUST_BLOCK;
+ }
+
+ inline void SetLastBlock( const SvxAdjust eType )
+ {
+ bLastBlock = eType == SVX_ADJUST_BLOCK;
+ bLastCenter = eType == SVX_ADJUST_CENTER;
+ }
+
+ inline void SetAdjust( const SvxAdjust eType )
+ {
+ bLeft = eType == SVX_ADJUST_LEFT;
+ bRight = eType == SVX_ADJUST_RIGHT;
+ bCenter = eType == SVX_ADJUST_CENTER;
+ bBlock = eType == SVX_ADJUST_BLOCK;
+ }
+
+ inline SvxAdjust GetLastBlock() const
+ {
+ SvxAdjust eRet = SVX_ADJUST_LEFT;
+
+ if ( bLastBlock )
+ eRet = SVX_ADJUST_BLOCK;
+ else if( bLastCenter )
+ eRet = SVX_ADJUST_CENTER;
+ return eRet;
+ }
+
+ inline SvxAdjust GetOneWord() const
+ {
+ SvxAdjust eRet = SVX_ADJUST_LEFT;
+
+ if ( bBlock && bOneBlock )
+ eRet = SVX_ADJUST_BLOCK;
+ return eRet;
+ }
+
+ inline SvxAdjust GetAdjust() const
+ {
+ SvxAdjust eRet = SVX_ADJUST_LEFT;
+
+ if ( bRight )
+ eRet = SVX_ADJUST_RIGHT;
+ else if ( bCenter )
+ eRet = SVX_ADJUST_CENTER;
+ else if ( bBlock )
+ eRet = SVX_ADJUST_BLOCK;
+ return eRet;
+ }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/akrnitem.hxx b/editeng/inc/editeng/akrnitem.hxx
deleted file mode 100644
index 19e089e..0000000
--- a/editeng/inc/editeng/akrnitem.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_AKRNITEM_HXX
-#define _SVX_AKRNITEM_HXX
-
-#include <svl/eitem.hxx>
-#include <editeng/editengdllapi.h>
-
-class SvXMLUnitConverter;
-namespace rtl
-{
- class OUString;
-}
-
-// class SvxAutoKernItem -------------------------------------------------
-
-/*
- [Description]
- Attribute for Pair-Kerning.
-*/
-
-class EDITENG_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
-{
-public:
- TYPEINFO();
-
- SvxAutoKernItem( const sal_Bool bAutoKern /*= sal_False*/,
- const sal_uInt16 nId );
-
- // "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
-
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
-
- inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern)
- {
- SetValue( rAutoKern.GetValue() );
- return *this;
- }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/autokernitem.hxx b/editeng/inc/editeng/autokernitem.hxx
new file mode 100644
index 0000000..19e089e
--- /dev/null
+++ b/editeng/inc/editeng/autokernitem.hxx
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_AKRNITEM_HXX
+#define _SVX_AKRNITEM_HXX
+
+#include <svl/eitem.hxx>
+#include <editeng/editengdllapi.h>
+
+class SvXMLUnitConverter;
+namespace rtl
+{
+ class OUString;
+}
+
+// class SvxAutoKernItem -------------------------------------------------
+
+/*
+ [Description]
+ Attribute for Pair-Kerning.
+*/
+
+class EDITENG_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
+{
+public:
+ TYPEINFO();
+
+ SvxAutoKernItem( const sal_Bool bAutoKern /*= sal_False*/,
+ const sal_uInt16 nId );
+
+ // "pure virtual Methods" from SfxPoolItem
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
+
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = 0 ) const;
+
+ inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern)
+ {
+ SetValue( rAutoKern.GetValue() );
+ return *this;
+ }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/blinkitem.hxx b/editeng/inc/editeng/blinkitem.hxx
new file mode 100644
index 0000000..4ef638e
--- /dev/null
+++ b/editeng/inc/editeng/blinkitem.hxx
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_BLNKITEM_HXX
+#define _SVX_BLNKITEM_HXX
+
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
+#include <editeng/editengdllapi.h>
+
+class SvXMLUnitConverter;
+namespace rtl
+{
+ class OUString;
+}
+
+// class SvxBlinkItem -------------------------------------------------
+
+/*
+ [Description]
+ This item describes, whether to flash.
+*/
+
+class EDITENG_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
+{
+public:
+ TYPEINFO();
+
+ SvxBlinkItem( const sal_Bool bBlink /*= sal_False*/, const sal_uInt16 nId );
+
+ // "pure virtual Methods" from SfxPoolItem
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = 0 ) const;
+
+ inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) {
+ SetValue(rBlink.GetValue());
+ return *this;
+ }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/blnkitem.hxx b/editeng/inc/editeng/blnkitem.hxx
deleted file mode 100644
index 4ef638e..0000000
--- a/editeng/inc/editeng/blnkitem.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_BLNKITEM_HXX
-#define _SVX_BLNKITEM_HXX
-
-#include <svl/poolitem.hxx>
-#include <svl/eitem.hxx>
-#include <editeng/editengdllapi.h>
-
-class SvXMLUnitConverter;
-namespace rtl
-{
- class OUString;
-}
-
-// class SvxBlinkItem -------------------------------------------------
-
-/*
- [Description]
- This item describes, whether to flash.
-*/
-
-class EDITENG_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
-{
-public:
- TYPEINFO();
-
- SvxBlinkItem( const sal_Bool bBlink /*= sal_False*/, const sal_uInt16 nId );
-
- // "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
-
- inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) {
- SetValue(rBlink.GetValue());
- return *this;
- }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
deleted file mode 100644
index 07ad4da..0000000
--- a/editeng/inc/editeng/bolnitem.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_BOLNITEM_HXX
-#define _SVX_BOLNITEM_HXX
-
-#include <svl/poolitem.hxx>
-#include "editeng/editengdllapi.h"
-
-
-
-// class SvxLineItem -----------------------------------------------------
-
-
-/*
-[Description]
-This Item transports a editeng::SvxBorderLine.
-*/
-
-namespace editeng {
- class SvxBorderLine;
-}
-
-class EDITENG_DLLPUBLIC SvxLineItem : public SfxPoolItem
-{
-public:
- TYPEINFO();
-
- explicit SvxLineItem( const sal_uInt16 nId );
- SvxLineItem( const SvxLineItem& rCpy );
- ~SvxLineItem();
- SvxLineItem &operator=( const SvxLineItem& rLine );
-
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
- virtual bool ScaleMetrics( long nMult, long nDiv );
- virtual bool HasMetrics() const;
-
- const editeng::SvxBorderLine* GetLine () const { return pLine; }
- void SetLine ( const editeng::SvxBorderLine *pNew );
-
-private:
- editeng::SvxBorderLine* pLine;
-};
-
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
deleted file mode 100644
index 9aab77c..0000000
--- a/editeng/inc/editeng/brkitem.hxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_BRKITEM_HXX
-#define _SVX_BRKITEM_HXX
-
-#include <svl/eitem.hxx>
-#include <editeng/svxenum.hxx>
-#include <editeng/editengdllapi.h>
-
-namespace rtl
-{
- class OUString;
-}
-
-// class SvxFmtBreakItem -------------------------------------------------
-
-/* [Description]
-
- This item Describes a wrap-attribute
- Automatic?, Page or column break, before or after?
-*/
-#define FMTBREAK_NOAUTO ((sal_uInt16)0x0001)
-
-class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
-{
-public:
- TYPEINFO();
-
- inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
- const sal_uInt16 nWhich );
- inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak );
- inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
-
- // "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
-
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
- virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const;
- virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
- virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const;
- virtual sal_uInt16 GetValueCount() const;
-
- // MS VC4.0 messes things up
- void SetValue( sal_uInt16 nNewVal )
- {SfxEnumItem::SetValue(nNewVal); }
- SvxBreak GetBreak() const { return SvxBreak( GetValue() ); }
- void SetBreak( const SvxBreak eNew )
- { SetValue( (sal_uInt16)eNew ); }
-};
-
-
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
- const sal_uInt16 _nWhich ) :
- SfxEnumItem( _nWhich, (sal_uInt16)eBreak )
-{}
-
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) :
- SfxEnumItem( rBreak )
-{}
-
-inline SvxFmtBreakItem& SvxFmtBreakItem::operator=(
- const SvxFmtBreakItem& rBreak )
-{
- SetValue( rBreak.GetValue() );
- return *this;
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
deleted file mode 100644
index c92f406..0000000
--- a/editeng/inc/editeng/brshitem.hxx
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_BRSHITEM_HXX
-#define _SVX_BRSHITEM_HXX
-
-#include <svl/poolitem.hxx>
-#include <vcl/wall.hxx>
-#include <tools/link.hxx>
-#include <editeng/editengdllapi.h>
-
-// class SvxBrushItem ----------------------------------------------------
-
-class Graphic;
-class GraphicObject;
-class CntWallpaperItem;
-namespace rtl
-{
- class OUString;
-}
-
-#define BRUSH_GRAPHIC_VERSION ((sal_uInt16)0x0001)
-
-enum SvxGraphicPosition
-{
- GPOS_NONE,
- GPOS_LT, GPOS_MT, GPOS_RT,
- GPOS_LM, GPOS_MM, GPOS_RM,
- GPOS_LB, GPOS_MB, GPOS_RB,
- GPOS_AREA, GPOS_TILED
-};
-
-#define PARA_DEST_PARA 0
-#define PARA_DEST_CHAR 1
-
-class SvxBrushItem_Impl;
-class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
-{
- Color aColor;
- SvxBrushItem_Impl* pImpl;
- String* pStrLink;
- String* pStrFilter;
- SvxGraphicPosition eGraphicPos;
- sal_Bool bLoadAgain;
-
- void ApplyGraphicTransparency_Impl();
- DECL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void *);
- // wird nur von Create benutzt
- SvxBrushItem( SvStream& rStrm,
- sal_uInt16 nVersion, sal_uInt16 nWhich );
-
-public:
- TYPEINFO();
-
- explicit SvxBrushItem( sal_uInt16 nWhich );
- SvxBrushItem( const Color& rColor, sal_uInt16 nWhich );
-
- SvxBrushItem( const Graphic& rGraphic,
- SvxGraphicPosition ePos, sal_uInt16 nWhich );
- SvxBrushItem( const GraphicObject& rGraphicObj,
- SvxGraphicPosition ePos, sal_uInt16 nWhich );
- SvxBrushItem( const String& rLink, const String& rFilter,
- SvxGraphicPosition ePos, sal_uInt16 nWhich );
- SvxBrushItem( const SvxBrushItem& );
- SvxBrushItem( const CntWallpaperItem&, sal_uInt16 nWhich );
-
- ~SvxBrushItem();
-
-public:
-
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
-
- virtual int operator==( const SfxPoolItem& ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const;
- virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const;
- virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
-
- const Color& GetColor() const { return aColor; }
- Color& GetColor() { return aColor; }
- void SetColor( const Color& rCol) { aColor = rCol; }
-
- void SetDoneLink( const Link& rLink );
-
- SvxGraphicPosition GetGraphicPos() const { return eGraphicPos; }
-
- void PurgeMedium() const;
-
- const Graphic* GetGraphic() const;
- const GraphicObject* GetGraphicObject() const;
- const String* GetGraphicLink() const { return pStrLink; }
- const String* GetGraphicFilter() const { return pStrFilter; }
-
- void SetGraphicPos( SvxGraphicPosition eNew );
- void SetGraphic( const Graphic& rNew );
- void SetGraphicObject( const GraphicObject& rNewObj );
- void SetGraphicLink( const String& rNew );
- void SetGraphicFilter( const String& rNew );
-
- SvxBrushItem& operator=( const SvxBrushItem& rItem);
-
- static SvxGraphicPosition WallpaperStyle2GraphicPos( WallpaperStyle eStyle );
- static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos );
-};
-
-#endif // #ifndef _SVX_BRSHITEM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/brushitem.hxx b/editeng/inc/editeng/brushitem.hxx
new file mode 100644
index 0000000..c92f406
--- /dev/null
+++ b/editeng/inc/editeng/brushitem.hxx
@@ -0,0 +1,129 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_BRSHITEM_HXX
+#define _SVX_BRSHITEM_HXX
+
+#include <svl/poolitem.hxx>
+#include <vcl/wall.hxx>
+#include <tools/link.hxx>
+#include <editeng/editengdllapi.h>
+
+// class SvxBrushItem ----------------------------------------------------
+
+class Graphic;
+class GraphicObject;
+class CntWallpaperItem;
+namespace rtl
+{
+ class OUString;
+}
+
+#define BRUSH_GRAPHIC_VERSION ((sal_uInt16)0x0001)
+
+enum SvxGraphicPosition
+{
+ GPOS_NONE,
+ GPOS_LT, GPOS_MT, GPOS_RT,
+ GPOS_LM, GPOS_MM, GPOS_RM,
+ GPOS_LB, GPOS_MB, GPOS_RB,
+ GPOS_AREA, GPOS_TILED
+};
+
+#define PARA_DEST_PARA 0
+#define PARA_DEST_CHAR 1
+
+class SvxBrushItem_Impl;
+class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
+{
+ Color aColor;
+ SvxBrushItem_Impl* pImpl;
+ String* pStrLink;
+ String* pStrFilter;
+ SvxGraphicPosition eGraphicPos;
+ sal_Bool bLoadAgain;
+
+ void ApplyGraphicTransparency_Impl();
+ DECL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void *);
+ // wird nur von Create benutzt
+ SvxBrushItem( SvStream& rStrm,
+ sal_uInt16 nVersion, sal_uInt16 nWhich );
+
+public:
+ TYPEINFO();
+
+ explicit SvxBrushItem( sal_uInt16 nWhich );
+ SvxBrushItem( const Color& rColor, sal_uInt16 nWhich );
+
+ SvxBrushItem( const Graphic& rGraphic,
+ SvxGraphicPosition ePos, sal_uInt16 nWhich );
+ SvxBrushItem( const GraphicObject& rGraphicObj,
+ SvxGraphicPosition ePos, sal_uInt16 nWhich );
+ SvxBrushItem( const String& rLink, const String& rFilter,
+ SvxGraphicPosition ePos, sal_uInt16 nWhich );
+ SvxBrushItem( const SvxBrushItem& );
+ SvxBrushItem( const CntWallpaperItem&, sal_uInt16 nWhich );
+
+ ~SvxBrushItem();
+
+public:
+
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = 0 ) const;
+
+ virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const;
+ virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
+
+ const Color& GetColor() const { return aColor; }
+ Color& GetColor() { return aColor; }
+ void SetColor( const Color& rCol) { aColor = rCol; }
+
+ void SetDoneLink( const Link& rLink );
+
+ SvxGraphicPosition GetGraphicPos() const { return eGraphicPos; }
+
+ void PurgeMedium() const;
+
+ const Graphic* GetGraphic() const;
+ const GraphicObject* GetGraphicObject() const;
+ const String* GetGraphicLink() const { return pStrLink; }
+ const String* GetGraphicFilter() const { return pStrFilter; }
+
+ void SetGraphicPos( SvxGraphicPosition eNew );
+ void SetGraphic( const Graphic& rNew );
+ void SetGraphicObject( const GraphicObject& rNewObj );
+ void SetGraphicLink( const String& rNew );
+ void SetGraphicFilter( const String& rNew );
+
+ SvxBrushItem& operator=( const SvxBrushItem& rItem);
+
+ static SvxGraphicPosition WallpaperStyle2GraphicPos( WallpaperStyle eStyle );
+ static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos );
+};
+
+#endif // #ifndef _SVX_BRSHITEM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/bulitem.hxx b/editeng/inc/editeng/bulitem.hxx
deleted file mode 100644
index 345cf3f..0000000
--- a/editeng/inc/editeng/bulitem.hxx
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_BULITEM_HXX
-#define _SVX_BULITEM_HXX
-
-#include "editeng/editengdllapi.h"
-
-
-// define ----------------------------------------------------------------
-
-// Styles
-#define BS_ABC_BIG 0
-#define BS_ABC_SMALL 1
-#define BS_ROMAN_BIG 2
-#define BS_ROMAN_SMALL 3
-#define BS_123 4
-#define BS_NONE 5
-#define BS_BULLET 6
-#define BS_BMP 128
-
-// Justification
-#define BJ_HLEFT 0x01
-#define BJ_HRIGHT 0x02
-#define BJ_HCENTER 0x04
-#define BJ_VTOP 0x08
-#define BJ_VBOTTOM 0x10
-#define BJ_VCENTER 0x20
-
-// Valid-Bits
-// First, only the values that are changed by the dialogue ...
-#define VALID_FONTCOLOR 0x0001
-#define VALID_FONTNAME 0x0002
-#define VALID_SYMBOL 0x0004
-#define VALID_BITMAP 0x0008
-#define VALID_SCALE 0x0010
-#define VALID_START 0x0020
-#define VALID_STYLE 0x0040
-#define VALID_PREVTEXT 0x0080
-#define VALID_FOLLOWTEXT 0x0100
-#include <svl/poolitem.hxx>
-#include <vcl/font.hxx>
-#include <svtools/grfmgr.hxx>
-
-// class SvxBulletItem ---------------------------------------------------
-
-class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
-{
- Font aFont;
- GraphicObject* pGraphicObject;
- String aPrevText;
- String aFollowText;
- sal_uInt16 nStart;
- sal_uInt16 nStyle;
- long nWidth;
- sal_uInt16 nScale;
- sal_Unicode cSymbol;
- sal_uInt8 nJustify;
- sal_uInt16 nValidMask; // Only temporary for GetAttribs / setAttribs,
- // because of the large Bullets
-
-#ifdef _SVX_BULITEM_CXX
- void SetDefaultFont_Impl();
- void SetDefaults_Impl();
-#endif
-
-public:
- TYPEINFO();
-
- explicit SvxBulletItem( sal_uInt16 nWhich = 0 );
- explicit SvxBulletItem( SvStream& rStrm, sal_uInt16 nWhich = 0 );
- SvxBulletItem( const SvxBulletItem& );
- ~SvxBulletItem();
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const;
- virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const;
-
- String GetFullText() const;
- sal_Unicode GetSymbol() const { return cSymbol; }
- String GetPrevText() const { return aPrevText; }
- String GetFollowText() const { return aFollowText; }
-
- sal_uInt16 GetStart() const { return nStart; }
- long GetWidth() const { return nWidth; }
- sal_uInt16 GetStyle() const { return nStyle; }
- sal_uInt8 GetJustification() const { return nJustify; }
- Font GetFont() const { return aFont; }
- sal_uInt16 GetScale() const { return nScale; }
-
- const GraphicObject& GetGraphicObject() const;
- void SetGraphicObject( const GraphicObject& rGraphicObject );
-
- void SetSymbol( sal_Unicode c) { cSymbol = c; }
- void SetPrevText( const String& rStr) { aPrevText = rStr;}
- void SetFollowText(const String& rStr) { aFollowText=rStr;}
-
- void SetStart( sal_uInt16 nNew ) { nStart = nNew; }
- void SetWidth( long nNew ) { nWidth = nNew; }
- void SetStyle( sal_uInt16 nNew ) { nStyle = nNew; }
- void SetJustification( sal_uInt8 nNew ) { nJustify = nNew; }
- void SetFont( const Font& rNew) { aFont = rNew; }
- void SetScale( sal_uInt16 nNew ) { nScale = nNew; }
-
- virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const;
- virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
-
- static void StoreFont( SvStream&, const Font& );
- static Font CreateFont( SvStream&, sal_uInt16 nVer );
-
- sal_uInt16& GetValidMask() { return nValidMask; }
- sal_uInt16 GetValidMask() const { return nValidMask; }
- sal_uInt16 IsValid( sal_uInt16 nFlag ) const { return nValidMask & nFlag; }
- void SetValid( sal_uInt16 nFlag, sal_Bool bValid )
- {
- if ( bValid )
- nValidMask |= nFlag;
- else
- nValidMask &= ~nFlag;
- }
- void CopyValidProperties( const SvxBulletItem& rCopyFrom );
-};
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/bulletitem.hxx b/editeng/inc/editeng/bulletitem.hxx
new file mode 100644
index 0000000..345cf3f
--- /dev/null
+++ b/editeng/inc/editeng/bulletitem.hxx
@@ -0,0 +1,146 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_BULITEM_HXX
+#define _SVX_BULITEM_HXX
+
+#include "editeng/editengdllapi.h"
+
+
+// define ----------------------------------------------------------------
+
+// Styles
+#define BS_ABC_BIG 0
+#define BS_ABC_SMALL 1
+#define BS_ROMAN_BIG 2
+#define BS_ROMAN_SMALL 3
+#define BS_123 4
+#define BS_NONE 5
+#define BS_BULLET 6
+#define BS_BMP 128
+
+// Justification
+#define BJ_HLEFT 0x01
+#define BJ_HRIGHT 0x02
+#define BJ_HCENTER 0x04
+#define BJ_VTOP 0x08
+#define BJ_VBOTTOM 0x10
+#define BJ_VCENTER 0x20
+
+// Valid-Bits
+// First, only the values that are changed by the dialogue ...
+#define VALID_FONTCOLOR 0x0001
+#define VALID_FONTNAME 0x0002
+#define VALID_SYMBOL 0x0004
+#define VALID_BITMAP 0x0008
+#define VALID_SCALE 0x0010
+#define VALID_START 0x0020
+#define VALID_STYLE 0x0040
+#define VALID_PREVTEXT 0x0080
+#define VALID_FOLLOWTEXT 0x0100
+#include <svl/poolitem.hxx>
+#include <vcl/font.hxx>
+#include <svtools/grfmgr.hxx>
+
+// class SvxBulletItem ---------------------------------------------------
+
+class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
+{
+ Font aFont;
+ GraphicObject* pGraphicObject;
+ String aPrevText;
+ String aFollowText;
+ sal_uInt16 nStart;
+ sal_uInt16 nStyle;
+ long nWidth;
+ sal_uInt16 nScale;
+ sal_Unicode cSymbol;
+ sal_uInt8 nJustify;
+ sal_uInt16 nValidMask; // Only temporary for GetAttribs / setAttribs,
+ // because of the large Bullets
+
+#ifdef _SVX_BULITEM_CXX
+ void SetDefaultFont_Impl();
+ void SetDefaults_Impl();
+#endif
+
+public:
+ TYPEINFO();
+
+ explicit SvxBulletItem( sal_uInt16 nWhich = 0 );
+ explicit SvxBulletItem( SvStream& rStrm, sal_uInt16 nWhich = 0 );
+ SvxBulletItem( const SvxBulletItem& );
+ ~SvxBulletItem();
+
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const;
+ virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const;
+
+ String GetFullText() const;
+ sal_Unicode GetSymbol() const { return cSymbol; }
+ String GetPrevText() const { return aPrevText; }
+ String GetFollowText() const { return aFollowText; }
+
+ sal_uInt16 GetStart() const { return nStart; }
+ long GetWidth() const { return nWidth; }
+ sal_uInt16 GetStyle() const { return nStyle; }
+ sal_uInt8 GetJustification() const { return nJustify; }
+ Font GetFont() const { return aFont; }
+ sal_uInt16 GetScale() const { return nScale; }
+
+ const GraphicObject& GetGraphicObject() const;
+ void SetGraphicObject( const GraphicObject& rGraphicObject );
+
+ void SetSymbol( sal_Unicode c) { cSymbol = c; }
+ void SetPrevText( const String& rStr) { aPrevText = rStr;}
+ void SetFollowText(const String& rStr) { aFollowText=rStr;}
+
+ void SetStart( sal_uInt16 nNew ) { nStart = nNew; }
+ void SetWidth( long nNew ) { nWidth = nNew; }
+ void SetStyle( sal_uInt16 nNew ) { nStyle = nNew; }
+ void SetJustification( sal_uInt8 nNew ) { nJustify = nNew; }
+ void SetFont( const Font& rNew) { aFont = rNew; }
+ void SetScale( sal_uInt16 nNew ) { nScale = nNew; }
+
+ virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const;
+ virtual int operator==( const SfxPoolItem& ) const;
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = 0 ) const;
+
+ static void StoreFont( SvStream&, const Font& );
+ static Font CreateFont( SvStream&, sal_uInt16 nVer );
+
+ sal_uInt16& GetValidMask() { return nValidMask; }
+ sal_uInt16 GetValidMask() const { return nValidMask; }
+ sal_uInt16 IsValid( sal_uInt16 nFlag ) const { return nValidMask & nFlag; }
+ void SetValid( sal_uInt16 nFlag, sal_Bool bValid )
+ {
+ if ( bValid )
+ nValidMask |= nFlag;
+ else
+ nValidMask &= ~nFlag;
+ }
+ void CopyValidProperties( const SvxBulletItem& rCopyFrom );
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/charsetcoloritem.hxx b/editeng/inc/editeng/charsetcoloritem.hxx
new file mode 100644
index 0000000..6fc197fb
--- /dev/null
+++ b/editeng/inc/editeng/charsetcoloritem.hxx
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_CSCOITEM_HXX
+#define _SVX_CSCOITEM_HXX
+
+#include <tools/string.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/editengdllapi.h>
+
+// class SvxCharSetColorItem ---------------------------------------------
+
+/* [Description]
+
+ Is only needed internally in the reader of Writer.
+*/
+
+class EDITENG_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
+{
+ rtl_TextEncoding eFrom;
+public:
+ TYPEINFO();
+
+ explicit SvxCharSetColorItem( const sal_uInt16 nId );
+ SvxCharSetColorItem( const Color& aColor, const rtl_TextEncoding eFrom,
+ const sal_uInt16 nId );
+
+ // "pure virtual Methods" from SfxPoolItem
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = 0 ) const;
+
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
+
+ inline rtl_TextEncoding& GetCharSet() { return eFrom; }
+ inline rtl_TextEncoding GetCharSet() const { return eFrom; }
+
+ inline SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor)
+ {
+ SetValue( rColor.GetValue() );
+ eFrom = rColor.GetCharSet();
+ return *this;
+ }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/cntritem.hxx b/editeng/inc/editeng/cntritem.hxx
deleted file mode 100644
index 079b1d4..0000000
--- a/editeng/inc/editeng/cntritem.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_ITEM_HXX
-#define _SVX_ITEM_HXX
-
-#include <svl/eitem.hxx>
-#include <editeng/editengdllapi.h>
-
-// class SvxContourItem --------------------------------------------------
-
-/* [Description]
- This item describes, if contour is employed.
-*/
-
-class EDITENG_DLLPUBLIC SvxContourItem : public SfxBoolItem
-{
-public:
- TYPEINFO();
-
- SvxContourItem( const sal_Bool bContoured /*= sal_False*/,
- const sal_uInt16 nId );
-
- // "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
-
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
-
- inline SvxContourItem& operator=(const SvxContourItem& rCont)
- {
- SetValue(rCont.GetValue());
- return *this;
- }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/contouritem.hxx b/editeng/inc/editeng/contouritem.hxx
new file mode 100644
index 0000000..316f21f
--- /dev/null
+++ b/editeng/inc/editeng/contouritem.hxx
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __EDITENG_CONTOUR_ITEM_HXX__
+#define __EDITENG_CONTOUR_ITEM_HXX__
+
+#include <svl/eitem.hxx>
+#include <editeng/editengdllapi.h>
+
+// class SvxContourItem --------------------------------------------------
+
+/* [Description]
+ This item describes, if contour is employed.
+*/
+
+class EDITENG_DLLPUBLIC SvxContourItem : public SfxBoolItem
+{
+public:
+ TYPEINFO();
+
+ SvxContourItem( const sal_Bool bContoured /*= sal_False*/,
+ const sal_uInt16 nId );
+
+ // "pure virtual Methods" from SfxPoolItem
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
+
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = 0 ) const;
+
+ inline SvxContourItem& operator=(const SvxContourItem& rCont)
+ {
+ SetValue(rCont.GetValue());
+ return *this;
+ }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/crossedoutitem.hxx b/editeng/inc/editeng/crossedoutitem.hxx
new file mode 100644
index 0000000..6906d18
--- /dev/null
+++ b/editeng/inc/editeng/crossedoutitem.hxx
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_CRSDITEM_HXX
+#define _SVX_CRSDITEM_HXX
+
+#include <vcl/vclenum.hxx>
+#include <svl/eitem.hxx>
+#include <editeng/editengdllapi.h>
+
+class SvXMLUnitConverter;
+namespace rtl
+{
+ class OUString;
+}
+
+// class SvxCrossedOutItem -----------------------------------------------
+
+/* [Description]
+ This item describes, whether and how it is striked out.
+*/
+
+class EDITENG_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem
+{
+public:
+ TYPEINFO();
+
+ SvxCrossedOutItem( const FontStrikeout eSt /*= STRIKEOUT_NONE*/,
+ const sal_uInt16 nId );
+
+ // "pure virtual Methods" from SfxPoolItem
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = 0 ) const;
+
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+ // MS VC4.0 messes things up
+ void SetValue( sal_uInt16 nNewVal )
+ {SfxEnumItem::SetValue(nNewVal); }
+
+ virtual int HasBoolValue() const;
+ virtual sal_Bool GetBoolValue() const;
+ virtual void SetBoolValue( sal_Bool bVal );
+
+ inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross)
+ {
+ SetValue( rCross.GetValue() );
+ return *this;
+ }
+
+ // enum cast
+ FontStrikeout GetStrikeout() const
+ { return (FontStrikeout)GetValue(); }
+ void SetStrikeout( FontStrikeout eNew )
+ { SetValue( (sal_uInt16)eNew ); }
+};
+
+#endif // #ifndef _SVX_CRSDITEM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
deleted file mode 100644
index 6906d18..0000000
--- a/editeng/inc/editeng/crsditem.hxx
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_CRSDITEM_HXX
-#define _SVX_CRSDITEM_HXX
-
-#include <vcl/vclenum.hxx>
-#include <svl/eitem.hxx>
-#include <editeng/editengdllapi.h>
-
-class SvXMLUnitConverter;
-namespace rtl
-{
- class OUString;
-}
-
-// class SvxCrossedOutItem -----------------------------------------------
-
-/* [Description]
- This item describes, whether and how it is striked out.
-*/
-
-class EDITENG_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem
-{
-public:
- TYPEINFO();
-
- SvxCrossedOutItem( const FontStrikeout eSt /*= STRIKEOUT_NONE*/,
- const sal_uInt16 nId );
-
- // "pure virtual Methods" from SfxPoolItem
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
- virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetValueCount() const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
-
- // MS VC4.0 messes things up
- void SetValue( sal_uInt16 nNewVal )
- {SfxEnumItem::SetValue(nNewVal); }
-
- virtual int HasBoolValue() const;
- virtual sal_Bool GetBoolValue() const;
- virtual void SetBoolValue( sal_Bool bVal );
-
- inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross)
- {
- SetValue( rCross.GetValue() );
- return *this;
- }
-
- // enum cast
- FontStrikeout GetStrikeout() const
- { return (FontStrikeout)GetValue(); }
- void SetStrikeout( FontStrikeout eNew )
- { SetValue( (sal_uInt16)eNew ); }
-};
-
-#endif // #ifndef _SVX_CRSDITEM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/cscoitem.hxx b/editeng/inc/editeng/cscoitem.hxx
deleted file mode 100644
index 6fc197fb..0000000
--- a/editeng/inc/editeng/cscoitem.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_CSCOITEM_HXX
-#define _SVX_CSCOITEM_HXX
-
-#include <tools/string.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/editengdllapi.h>
-
-// class SvxCharSetColorItem ---------------------------------------------
-
-/* [Description]
-
- Is only needed internally in the reader of Writer.
-*/
-
-class EDITENG_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
-{
- rtl_TextEncoding eFrom;
-public:
- TYPEINFO();
-
- explicit SvxCharSetColorItem( const sal_uInt16 nId );
- SvxCharSetColorItem( const Color& aColor, const rtl_TextEncoding eFrom,
- const sal_uInt16 nId );
-
- // "pure virtual Methods" from SfxPoolItem
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
-
- inline rtl_TextEncoding& GetCharSet() { return eFrom; }
- inline rtl_TextEncoding GetCharSet() const { return eFrom; }
-
- inline SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor)
- {
- SetValue( rColor.GetValue() );
- eFrom = rColor.GetCharSet();
- return *this;
- }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/emphasismarkitem.hxx b/editeng/inc/editeng/emphasismarkitem.hxx
new file mode 100644
index 0000000..7e9695f
--- /dev/null
+++ b/editeng/inc/editeng/emphasismarkitem.hxx
@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_EMPHITEM_HXX
+#define _SVX_EMPHITEM_HXX
+
+#include <vcl/vclenum.hxx>
+#include <svl/intitem.hxx>
+#include <editeng/editengdllapi.h>
+
+class SvXMLUnitConverter;
+namespace rtl
+{
+ class OUString;
+}
+
+// class SvxEmphasisMarkItem ----------------------------------------------
+
+/* [Description]
+
+ This item describes the Font emphasis.
+*/
+
+class EDITENG_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item
+{
+public:
+ TYPEINFO();
+
+ SvxEmphasisMarkItem( const FontEmphasisMark eVal /*= EMPHASISMARK_NONE*/,
+ const sal_uInt16 nId );
+
+ // "pure virtual Methods" from SfxPoolItem + SfxEnumItem
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText,
+ const IntlWrapper * = 0 ) const;
+
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
+
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+ inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem )
+ {
+ SetValue( rItem.GetValue() );
+ return *this;
+ }
+
+ // enum cast
+ FontEmphasisMark GetEmphasisMark() const
+ { return (FontEmphasisMark)GetValue(); }
+ void SetEmphasisMark( FontEmphasisMark eNew )
+ { SetValue( (sal_uInt16)eNew ); }
+};
+
+#endif // #ifndef _SVX_EMPHITEM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx
deleted file mode 100644
index 7e9695f..0000000
--- a/editeng/inc/editeng/emphitem.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_EMPHITEM_HXX
-#define _SVX_EMPHITEM_HXX
-
-#include <vcl/vclenum.hxx>
-#include <svl/intitem.hxx>
-#include <editeng/editengdllapi.h>
-
-class SvXMLUnitConverter;
-namespace rtl
-{
- class OUString;
-}
-
-// class SvxEmphasisMarkItem ----------------------------------------------
-
-/* [Description]
-
- This item describes the Font emphasis.
-*/
-
-class EDITENG_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item
-{
-public:
- TYPEINFO();
-
- SvxEmphasisMarkItem( const FontEmphasisMark eVal /*= EMPHASISMARK_NONE*/,
- const sal_uInt16 nId );
-
- // "pure virtual Methods" from SfxPoolItem + SfxEnumItem
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText,
- const IntlWrapper * = 0 ) const;
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
- virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
-
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
-
- inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem )
- {
- SetValue( rItem.GetValue() );
- return *this;
- }
-
- // enum cast
- FontEmphasisMark GetEmphasisMark() const
- { return (FontEmphasisMark)GetValue(); }
- void SetEmphasisMark( FontEmphasisMark eNew )
- { SetValue( (sal_uInt16)eNew ); }
-};
-
-#endif // #ifndef _SVX_EMPHITEM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/escapementitem.hxx b/editeng/inc/editeng/escapementitem.hxx
new file mode 100644
index 0000000..d16adbc
--- /dev/null
+++ b/editeng/inc/editeng/escapementitem.hxx
@@ -0,0 +1,105 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_ESCPITEM_HXX
+#define _SVX_ESCPITEM_HXX
+
+#include <svl/eitem.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
+
+class SvXMLUnitConverter;
+namespace rtl
+{
+ class OUString;
+}
+
+// class SvxEscapementItem -----------------------------------------------
+
+#define DFLT_ESC_SUPER 33 // 1/3
+#define DFLT_ESC_SUB -33 // also 1/3 previously 8/100
+#define DFLT_ESC_PROP 58
+#define DFLT_ESC_AUTO_SUPER 101
+#define DFLT_ESC_AUTO_SUB -101
+
+/* [Description]
+
+ This item describes the writing position.
+*/
+
+class EDITENG_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface
+{
+ short nEsc;
+ sal_uInt8 nProp;
+public:
+ TYPEINFO();
+
+ explicit SvxEscapementItem( const sal_uInt16 nId );
+ SvxEscapementItem( const SvxEscapement eEscape,
+ const sal_uInt16 nId );
+ SvxEscapementItem( const short nEsc, const sal_uInt8 nProp,
+ const sal_uInt16 nId );
+
+ // "pure virtual Methods" from SfxPoolItem
+ virtual int operator==( const SfxPoolItem& ) const;
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = 0 ) const;
+
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
+
+ inline void SetEscapement( const SvxEscapement eNew )
+ {
+ if( SVX_ESCAPEMENT_OFF == eNew )
+ nEsc = 0, nProp = 100;
+ else
+ if( SVX_ESCAPEMENT_SUPERSCRIPT == eNew )
+ nEsc = DFLT_ESC_SUPER, nProp = DFLT_ESC_PROP;
+ else
+ nEsc = DFLT_ESC_SUB, nProp = DFLT_ESC_PROP;
+ }
+ inline SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); }
+
+ inline short &GetEsc() { return nEsc; }
+ inline short GetEsc() const { return nEsc; }
+
+ inline sal_uInt8 &GetProp() { return nProp; }
+ inline sal_uInt8 GetProp() const { return nProp; }
+
+ inline SvxEscapementItem& operator=(const SvxEscapementItem& rEsc)
+ {
+ nEsc = rEsc.GetEsc();
+ nProp = rEsc.GetProp();
+ return *this;
+ }
+
+ virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetEnumValue() const;
+ virtual void SetEnumValue( sal_uInt16 nNewVal );
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
deleted file mode 100644
index d16adbc..0000000
--- a/editeng/inc/editeng/escpitem.hxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_ESCPITEM_HXX
-#define _SVX_ESCPITEM_HXX
-
-#include <svl/eitem.hxx>
-#include <editeng/svxenum.hxx>
-#include <editeng/editengdllapi.h>
-
-class SvXMLUnitConverter;
-namespace rtl
-{
- class OUString;
-}
-
-// class SvxEscapementItem -----------------------------------------------
-
-#define DFLT_ESC_SUPER 33 // 1/3
-#define DFLT_ESC_SUB -33 // also 1/3 previously 8/100
-#define DFLT_ESC_PROP 58
-#define DFLT_ESC_AUTO_SUPER 101
-#define DFLT_ESC_AUTO_SUB -101
-
-/* [Description]
-
- This item describes the writing position.
-*/
-
-class EDITENG_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface
-{
- short nEsc;
- sal_uInt8 nProp;
-public:
- TYPEINFO();
-
- explicit SvxEscapementItem( const sal_uInt16 nId );
- SvxEscapementItem( const SvxEscapement eEscape,
- const sal_uInt16 nId );
- SvxEscapementItem( const short nEsc, const sal_uInt8 nProp,
- const sal_uInt16 nId );
-
- // "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const;
-
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
-
- inline void SetEscapement( const SvxEscapement eNew )
- {
- if( SVX_ESCAPEMENT_OFF == eNew )
- nEsc = 0, nProp = 100;
- else
- if( SVX_ESCAPEMENT_SUPERSCRIPT == eNew )
- nEsc = DFLT_ESC_SUPER, nProp = DFLT_ESC_PROP;
- else
- nEsc = DFLT_ESC_SUB, nProp = DFLT_ESC_PROP;
- }
- inline SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); }
-
- inline short &GetEsc() { return nEsc; }
- inline short GetEsc() const { return nEsc; }
-
- inline sal_uInt8 &GetProp() { return nProp; }
- inline sal_uInt8 GetProp() const { return nProp; }
-
- inline SvxEscapementItem& operator=(const SvxEscapementItem& rEsc)
- {
- nEsc = rEsc.GetEsc();
- nProp = rEsc.GetProp();
- return *this;
- }
-
- virtual sal_uInt16 GetValueCount() const;
- virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetEnumValue() const;
- virtual void SetEnumValue( sal_uInt16 nNewVal );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/formatbreakitem.hxx b/editeng/inc/editeng/formatbreakitem.hxx
new file mode 100644
index 0000000..9aab77c
--- /dev/null
+++ b/editeng/inc/editeng/formatbreakitem.hxx
@@ -0,0 +1,94 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_BRKITEM_HXX
+#define _SVX_BRKITEM_HXX
+
+#include <svl/eitem.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
+
+namespace rtl
+{
+ class OUString;
+}
+
+// class SvxFmtBreakItem -------------------------------------------------
+
+/* [Description]
+
+ This item Describes a wrap-attribute
+ Automatic?, Page or column break, before or after?
+*/
+#define FMTBREAK_NOAUTO ((sal_uInt16)0x0001)
+
+class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
+{
+public:
+ TYPEINFO();
+
+ inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
+ const sal_uInt16 nWhich );
+ inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak );
+ inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
+
+ // "pure virtual Methods" from SfxPoolItem
+ virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = 0 ) const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
+ virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const;
+ virtual sal_uInt16 GetValueCount() const;
+
+ // MS VC4.0 messes things up
+ void SetValue( sal_uInt16 nNewVal )
+ {SfxEnumItem::SetValue(nNewVal); }
+ SvxBreak GetBreak() const { return SvxBreak( GetValue() ); }
+ void SetBreak( const SvxBreak eNew )
+ { SetValue( (sal_uInt16)eNew ); }
+};
+
+
+inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
+ const sal_uInt16 _nWhich ) :
+ SfxEnumItem( _nWhich, (sal_uInt16)eBreak )
+{}
+
+inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) :
+ SfxEnumItem( rBreak )
+{}
+
+inline SvxFmtBreakItem& SvxFmtBreakItem::operator=(
+ const SvxFmtBreakItem& rBreak )
+{
+ SetValue( rBreak.GetValue() );
+ return *this;
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/editeng/hyphenzoneitem.hxx b/editeng/inc/editeng/hyphenzoneitem.hxx
new file mode 100644
index 0000000..cacaf8c
--- /dev/null
+++ b/editeng/inc/editeng/hyphenzoneitem.hxx
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SVX_HYZNITEM_HXX
+#define _SVX_HYZNITEM_HXX
+
+#include <svl/poolitem.hxx>
+#include <editeng/editengdllapi.h>
+
+class SvXMLUnitConverter;
+namespace rtl
+{
+ class OUString;
+}
+
+// class SvxHyphenZoneItem -----------------------------------------------
+
+/* [Description]
+
+ This item describes a hyphenation attribute (automatic?, number of
+ characters at the end of the line and start).
+*/
+
+class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
+{
+ sal_Bool bHyphen: 1;
+ sal_Bool bPageEnd: 1;
+ sal_uInt8 nMinLead;
+ sal_uInt8 nMinTrail;
+ sal_uInt8 nMaxHyphens;
+
+ friend SvStream & operator<<( SvStream & aS, SvxHyphenZoneItem & );
+
+public:
+ TYPEINFO();
+
+ SvxHyphenZoneItem( const sal_Bool bHyph /*= sal_False*/,
+ const sal_uInt16 nId );
+
+ // "pure virtual Methods" from SfxPoolItem
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list