summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--connectivity/prj/d.lst4
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx12
-rw-r--r--connectivity/source/commontools/FValue.cxx10
-rwxr-xr-xconnectivity/util/makefile.mk25
-rw-r--r--desktop/source/app/langselect.cxx2
-rw-r--r--desktop/source/deployment/dp_persmap.cxx13
-rw-r--r--desktop/source/deployment/gui/dp_gui.h1
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx19
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx8
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatability.cxx277
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatability.hxx101
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx12
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.hxx4
-rw-r--r--desktop/source/deployment/gui/makefile.mk1
-rw-r--r--desktop/source/deployment/inc/dp_dependencies.hxx14
-rw-r--r--desktop/source/deployment/inc/dp_persmap.h2
-rw-r--r--desktop/source/deployment/misc/dp_dependencies.cxx12
-rw-r--r--desktop/source/deployment/misc/dp_misc.cxx14
-rw-r--r--desktop/source/migration/pages.cxx115
-rw-r--r--desktop/source/migration/pages.hxx1
-rwxr-xr-xdesktop/source/migration/services/extensionmigration.cxx10
-rwxr-xr-xdesktop/source/migration/services/extensionmigration.hxx2
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx9
-rw-r--r--desktop/source/migration/services/jvmfwk.hxx7
-rw-r--r--desktop/source/migration/services/makefile.mk3
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/setup.cpp25
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx2
-rw-r--r--drawinglayer/prj/build.lst2
-rw-r--r--drawinglayer/source/primitive2d/mediaprimitive2d.cxx2
-rw-r--r--drawinglayer/source/processor2d/vclhelperbitmaprender.cxx2
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx4
-rw-r--r--drawinglayer/util/makefile.mk1
-rw-r--r--editeng/inc/editeng.hrc43
-rw-r--r--editeng/inc/editeng/AccessibleComponentBase.hxx (renamed from svx/inc/svx/AccessibleComponentBase.hxx)4
-rw-r--r--editeng/inc/editeng/AccessibleContextBase.hxx (renamed from svx/inc/svx/AccessibleContextBase.hxx)8
-rw-r--r--editeng/inc/editeng/AccessibleEditableTextPara.hxx (renamed from svx/source/accessibility/AccessibleEditableTextPara.hxx)9
-rw-r--r--editeng/inc/editeng/AccessibleImageBullet.hxx (renamed from svx/source/accessibility/AccessibleImageBullet.hxx)4
-rw-r--r--editeng/inc/editeng/AccessibleParaManager.hxx (renamed from svx/source/accessibility/AccessibleParaManager.hxx)3
-rw-r--r--editeng/inc/editeng/AccessibleSelectionBase.hxx (renamed from svx/inc/AccessibleSelectionBase.hxx)4
-rw-r--r--editeng/inc/editeng/AccessibleStaticTextBase.hxx (renamed from svx/inc/AccessibleStaticTextBase.hxx)13
-rw-r--r--editeng/inc/editeng/AccessibleStringWrap.hxx (renamed from svx/source/inc/AccessibleStringWrap.hxx)8
-rw-r--r--editeng/inc/editeng/SpellPortions.hxx (renamed from svx/inc/svx/SpellPortions.hxx)0
-rw-r--r--editeng/inc/editeng/UnoForbiddenCharsTable.hxx (renamed from svx/inc/UnoForbiddenCharsTable.hxx)4
-rw-r--r--editeng/inc/editeng/acorrcfg.hxx (renamed from svx/inc/acorrcfg.hxx)8
-rw-r--r--editeng/inc/editeng/adjitem.hxx (renamed from svx/inc/svx/adjitem.hxx)12
-rw-r--r--editeng/inc/editeng/akrnitem.hxx (renamed from svx/inc/svx/akrnitem.hxx)7
-rw-r--r--editeng/inc/editeng/blnkitem.hxx (renamed from svx/inc/svx/blnkitem.hxx)7
-rw-r--r--editeng/inc/editeng/bolnitem.hxx (renamed from svx/inc/bolnitem.hxx)4
-rw-r--r--editeng/inc/editeng/borderline.hxx (renamed from svx/inc/svx/borderline.hxx)4
-rw-r--r--editeng/inc/editeng/boxitem.hxx (renamed from svx/inc/svx/boxitem.hxx)14
-rw-r--r--editeng/inc/editeng/brkitem.hxx (renamed from svx/inc/svx/brkitem.hxx)9
-rw-r--r--editeng/inc/editeng/brshitem.hxx (renamed from svx/inc/svx/brshitem.hxx)13
-rw-r--r--editeng/inc/editeng/bulitem.hxx (renamed from svx/inc/bulitem.hxx)6
-rw-r--r--editeng/inc/editeng/charhiddenitem.hxx (renamed from svx/inc/charhiddenitem.hxx)4
-rw-r--r--editeng/inc/editeng/charreliefitem.hxx (renamed from svx/inc/svx/charreliefitem.hxx)7
-rw-r--r--editeng/inc/editeng/charrotateitem.hxx (renamed from svx/inc/svx/charrotateitem.hxx)7
-rw-r--r--editeng/inc/editeng/charscaleitem.hxx (renamed from svx/inc/svx/charscaleitem.hxx)9
-rw-r--r--editeng/inc/editeng/cmapitem.hxx (renamed from svx/inc/svx/cmapitem.hxx)9
-rw-r--r--editeng/inc/editeng/cntritem.hxx (renamed from svx/inc/svx/cntritem.hxx)7
-rw-r--r--editeng/inc/editeng/colritem.hxx (renamed from svx/inc/svx/colritem.hxx)9
-rw-r--r--editeng/inc/editeng/crsditem.hxx (renamed from svx/inc/svx/crsditem.hxx)7
-rw-r--r--editeng/inc/editeng/cscoitem.hxx (renamed from svx/inc/svx/cscoitem.hxx)6
-rw-r--r--editeng/inc/editeng/editdata.hxx (renamed from svx/inc/svx/editdata.hxx)6
-rw-r--r--editeng/inc/editeng/editeng.hxx (renamed from svx/inc/svx/editeng.hxx)15
-rw-r--r--editeng/inc/editeng/editengdllapi.h43
-rw-r--r--editeng/inc/editeng/editerr.hxx39
-rw-r--r--editeng/inc/editeng/editids.hrc245
-rw-r--r--editeng/inc/editeng/editobj.hxx (renamed from svx/inc/svx/editobj.hxx)8
-rw-r--r--editeng/inc/editeng/editrids.hrc432
-rw-r--r--editeng/inc/editeng/editstat.hxx (renamed from svx/inc/editstat.hxx)0
-rw-r--r--editeng/inc/editeng/editund2.hxx (renamed from svx/inc/editund2.hxx)6
-rw-r--r--editeng/inc/editeng/editview.hxx (renamed from svx/inc/svx/editview.hxx)10
-rw-r--r--editeng/inc/editeng/edtdlg.hxx114
-rw-r--r--editeng/inc/editeng/eedata.hxx (renamed from svx/inc/svx/eedata.hxx)0
-rw-r--r--editeng/inc/editeng/eeitem.hxx (renamed from svx/inc/svx/eeitem.hxx)0
-rw-r--r--editeng/inc/editeng/eeitemid.hxx (renamed from svx/inc/svx/eeitemid.hxx)2
-rw-r--r--editeng/inc/editeng/eerdll.hxx (renamed from svx/inc/eerdll.hxx)5
-rw-r--r--editeng/inc/editeng/emphitem.hxx (renamed from svx/inc/svx/emphitem.hxx)7
-rw-r--r--editeng/inc/editeng/escpitem.hxx (renamed from svx/inc/svx/escpitem.hxx)9
-rw-r--r--editeng/inc/editeng/fhgtitem.hxx (renamed from svx/inc/svx/fhgtitem.hxx)7
-rw-r--r--editeng/inc/editeng/flditem.hxx (renamed from svx/inc/svx/flditem.hxx)34
-rw-r--r--editeng/inc/editeng/flstitem.hxx (renamed from svx/inc/flstitem.hxx)4
-rw-r--r--editeng/inc/editeng/fontitem.hxx (renamed from svx/inc/fontitem.hxx)8
-rw-r--r--editeng/inc/editeng/forbiddencharacterstable.hxx (renamed from svx/inc/forbiddencharacterstable.hxx)4
-rw-r--r--editeng/inc/editeng/forbiddenruleitem.hxx (renamed from svx/inc/svx/forbiddenruleitem.hxx)7
-rw-r--r--editeng/inc/editeng/frmdir.hxx (renamed from svx/inc/svx/frmdir.hxx)0
-rw-r--r--editeng/inc/editeng/frmdiritem.hxx (renamed from svx/inc/svx/frmdiritem.hxx)9
-rw-r--r--editeng/inc/editeng/fwdtitem.hxx (renamed from svx/inc/fwdtitem.hxx)0
-rw-r--r--editeng/inc/editeng/hangulhanja.hxx (renamed from svx/inc/svx/hangulhanja.hxx)8
-rw-r--r--editeng/inc/editeng/hngpnctitem.hxx (renamed from svx/inc/svx/hngpnctitem.hxx)7
-rw-r--r--editeng/inc/editeng/hyznitem.hxx (renamed from svx/inc/svx/hyznitem.hxx)7
-rw-r--r--editeng/inc/editeng/itemtype.hxx (renamed from svx/inc/svx/itemtype.hxx)19
-rw-r--r--editeng/inc/editeng/keepitem.hxx (renamed from svx/inc/svx/keepitem.hxx)7
-rw-r--r--editeng/inc/editeng/kernitem.hxx (renamed from svx/inc/svx/kernitem.hxx)7
-rw-r--r--editeng/inc/editeng/langitem.hxx (renamed from svx/inc/svx/langitem.hxx)7
-rw-r--r--editeng/inc/editeng/lcolitem.hxx (renamed from svx/inc/svx/lcolitem.hxx)7
-rw-r--r--editeng/inc/editeng/lrspitem.hxx (renamed from svx/inc/svx/lrspitem.hxx)7
-rw-r--r--editeng/inc/editeng/lspcitem.hxx (renamed from svx/inc/svx/lspcitem.hxx)10
-rw-r--r--editeng/inc/editeng/measfld.hxx66
-rw-r--r--editeng/inc/editeng/memberids.hrc196
-rw-r--r--editeng/inc/editeng/mutxhelp.hxx (renamed from svx/inc/svx/mutxhelp.hxx)0
-rw-r--r--editeng/inc/editeng/nhypitem.hxx (renamed from svx/inc/svx/nhypitem.hxx)7
-rw-r--r--editeng/inc/editeng/nlbkitem.hxx (renamed from svx/inc/nlbkitem.hxx)4
-rw-r--r--editeng/inc/editeng/numdef.hxx (renamed from svx/inc/svx/numdef.hxx)0
-rw-r--r--editeng/inc/editeng/numitem.hxx (renamed from svx/inc/svx/numitem.hxx)18
-rw-r--r--editeng/inc/editeng/opaqitem.hxx (renamed from svx/inc/opaqitem.hxx)4
-rw-r--r--editeng/inc/editeng/optitems.hxx (renamed from svx/inc/optitems.hxx)21
-rw-r--r--editeng/inc/editeng/orphitem.hxx (renamed from svx/inc/svx/orphitem.hxx)7
-rw-r--r--editeng/inc/editeng/outliner.hxx (renamed from svx/inc/svx/outliner.hxx)66
-rw-r--r--editeng/inc/editeng/outlobj.hxx (renamed from svx/inc/svx/outlobj.hxx)6
-rw-r--r--editeng/inc/editeng/paperinf.hxx (renamed from svx/inc/svx/paperinf.hxx)6
-rw-r--r--editeng/inc/editeng/paragraphdata.hxx (renamed from svx/inc/svx/paragraphdata.hxx)0
-rw-r--r--editeng/inc/editeng/paravertalignitem.hxx (renamed from svx/inc/svx/paravertalignitem.hxx)7
-rw-r--r--editeng/inc/editeng/pbinitem.hxx (renamed from svx/inc/svx/pbinitem.hxx)7
-rw-r--r--editeng/inc/editeng/pgrditem.hxx (renamed from svx/inc/pgrditem.hxx)4
-rw-r--r--editeng/inc/editeng/pmdlitem.hxx (renamed from svx/inc/svx/pmdlitem.hxx)7
-rw-r--r--editeng/inc/editeng/postitem.hxx (renamed from svx/inc/svx/postitem.hxx)7
-rw-r--r--editeng/inc/editeng/prntitem.hxx (renamed from svx/inc/prntitem.hxx)4
-rw-r--r--editeng/inc/editeng/protitem.hxx (renamed from svx/inc/protitem.hxx)4
-rw-r--r--editeng/inc/editeng/prszitem.hxx (renamed from svx/inc/svx/prszitem.hxx)7
-rw-r--r--editeng/inc/editeng/scriptspaceitem.hxx (renamed from svx/inc/svx/scriptspaceitem.hxx)7
-rw-r--r--editeng/inc/editeng/scripttypeitem.hxx (renamed from svx/inc/svx/scripttypeitem.hxx)11
-rw-r--r--editeng/inc/editeng/shaditem.hxx (renamed from svx/inc/svx/shaditem.hxx)9
-rw-r--r--editeng/inc/editeng/shdditem.hxx (renamed from svx/inc/svx/shdditem.hxx)7
-rw-r--r--editeng/inc/editeng/sizeitem.hxx (renamed from svx/inc/svx/sizeitem.hxx)7
-rw-r--r--editeng/inc/editeng/spltitem.hxx (renamed from svx/inc/svx/spltitem.hxx)7
-rw-r--r--editeng/inc/editeng/splwrap.hxx (renamed from svx/inc/svx/splwrap.hxx)12
-rw-r--r--editeng/inc/editeng/svxacorr.hxx (renamed from svx/inc/svx/svxacorr.hxx)26
-rw-r--r--editeng/inc/editeng/svxenum.hxx (renamed from svx/inc/svx/svxenum.hxx)0
-rw-r--r--editeng/inc/editeng/svxfont.hxx (renamed from svx/inc/svx/svxfont.hxx)6
-rw-r--r--editeng/inc/editeng/svxrtf.hxx (renamed from svx/inc/svxrtf.hxx)11
-rw-r--r--editeng/inc/editeng/swafopt.hxx (renamed from svx/inc/svx/swafopt.hxx)7
-rw-r--r--editeng/inc/editeng/tstpitem.hxx (renamed from svx/inc/svx/tstpitem.hxx)15
-rw-r--r--editeng/inc/editeng/twolinesitem.hxx (renamed from svx/inc/svx/twolinesitem.hxx)7
-rw-r--r--editeng/inc/editeng/txtrange.hxx (renamed from svx/inc/txtrange.hxx)4
-rw-r--r--editeng/inc/editeng/udlnitem.hxx (renamed from svx/inc/svx/udlnitem.hxx)11
-rw-r--r--editeng/inc/editeng/ulspitem.hxx (renamed from svx/inc/svx/ulspitem.hxx)7
-rw-r--r--editeng/inc/editeng/unoedhlp.hxx (renamed from svx/inc/unoedhlp.hxx)6
-rw-r--r--editeng/inc/editeng/unoedprx.hxx (renamed from svx/source/inc/unoedprx.hxx)8
-rw-r--r--editeng/inc/editeng/unoedsrc.hxx (renamed from svx/inc/svx/unoedsrc.hxx)8
-rw-r--r--editeng/inc/editeng/unofdesc.hxx (renamed from svx/inc/unofdesc.hxx)4
-rw-r--r--editeng/inc/editeng/unofield.hxx (renamed from svx/inc/svx/unofield.hxx)9
-rw-r--r--editeng/inc/editeng/unofored.hxx (renamed from svx/inc/svx/unofored.hxx)8
-rw-r--r--editeng/inc/editeng/unoforou.hxx (renamed from svx/inc/svx/unoforou.hxx)13
-rw-r--r--editeng/inc/editeng/unoipset.hxx (renamed from svx/inc/svx/unoipset.hxx)22
-rw-r--r--editeng/inc/editeng/unolingu.hxx (renamed from svx/inc/unolingu.hxx)38
-rw-r--r--editeng/inc/editeng/unonrule.hxx95
-rw-r--r--editeng/inc/editeng/unopracc.hxx (renamed from svx/source/inc/unopracc.hxx)3
-rw-r--r--editeng/inc/editeng/unoprnms.hxx (renamed from svx/inc/svx/unoprnms.hxx)0
-rw-r--r--editeng/inc/editeng/unotext.hxx (renamed from svx/inc/svx/unotext.hxx)73
-rw-r--r--editeng/inc/editeng/unoviwed.hxx (renamed from svx/inc/svx/unoviwed.hxx)4
-rw-r--r--editeng/inc/editeng/unoviwou.hxx (renamed from svx/inc/svx/unoviwou.hxx)8
-rw-r--r--editeng/inc/editeng/wghtitem.hxx (renamed from svx/inc/svx/wghtitem.hxx)7
-rw-r--r--editeng/inc/editeng/widwitem.hxx (renamed from svx/inc/svx/widwitem.hxx)8
-rw-r--r--editeng/inc/editeng/writingmodeitem.hxx (renamed from svx/inc/svx/writingmodeitem.hxx)5
-rw-r--r--editeng/inc/editeng/wrlmitem.hxx (renamed from svx/inc/svx/wrlmitem.hxx)7
-rw-r--r--editeng/inc/editeng/xmlcnitm.hxx (renamed from svx/inc/xmlcnitm.hxx)4
-rw-r--r--editeng/inc/editxml.hxx (renamed from svx/source/inc/editxml.hxx)0
-rw-r--r--editeng/inc/helpid.hrc81
-rw-r--r--editeng/inc/makefile.mk (renamed from svx/source/svxlink/makefile.mk)39
-rw-r--r--editeng/inc/pch/precompiled_editeng.cxx32
-rw-r--r--editeng/inc/pch/precompiled_editeng.hxx897
-rw-r--r--editeng/prj/build.lst13
-rw-r--r--editeng/prj/d.lst14
-rw-r--r--editeng/source/accessibility/AccessibleComponentBase.cxx (renamed from svx/source/accessibility/AccessibleComponentBase.cxx)9
-rw-r--r--editeng/source/accessibility/AccessibleContextBase.cxx (renamed from svx/source/accessibility/AccessibleContextBase.cxx)11
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx (renamed from svx/source/accessibility/AccessibleEditableTextPara.cxx)18
-rw-r--r--editeng/source/accessibility/AccessibleImageBullet.cxx (renamed from svx/source/accessibility/AccessibleImageBullet.cxx)24
-rw-r--r--editeng/source/accessibility/AccessibleParaManager.cxx (renamed from svx/source/accessibility/AccessibleParaManager.cxx)12
-rw-r--r--editeng/source/accessibility/AccessibleSelectionBase.cxx (renamed from svx/source/accessibility/AccessibleSelectionBase.cxx)4
-rw-r--r--editeng/source/accessibility/AccessibleStaticTextBase.cxx (renamed from svx/source/accessibility/AccessibleStaticTextBase.cxx)12
-rw-r--r--editeng/source/accessibility/AccessibleStringWrap.cxx (renamed from svx/source/accessibility/AccessibleStringWrap.cxx)7
-rw-r--r--editeng/source/accessibility/accessibility.src43
-rwxr-xr-xediteng/source/accessibility/makefile.mk58
-rw-r--r--editeng/source/editeng/editattr.cxx (renamed from svx/source/editeng/editattr.cxx)57
-rw-r--r--editeng/source/editeng/editattr.hxx (renamed from svx/source/editeng/editattr.hxx)2
-rw-r--r--editeng/source/editeng/editdbg.cxx (renamed from svx/source/editeng/editdbg.cxx)64
-rw-r--r--editeng/source/editeng/editdbg.hxx (renamed from svx/source/editeng/editdbg.hxx)2
-rw-r--r--editeng/source/editeng/editdoc.cxx (renamed from svx/source/editeng/editdoc.cxx)59
-rw-r--r--editeng/source/editeng/editdoc.hxx (renamed from svx/source/editeng/editdoc.hxx)2
-rw-r--r--editeng/source/editeng/editdoc2.cxx (renamed from svx/source/editeng/editdoc2.cxx)50
-rw-r--r--editeng/source/editeng/editeng.cxx (renamed from svx/source/editeng/editeng.cxx)87
-rw-r--r--editeng/source/editeng/editeng.src (renamed from svx/source/editeng/editeng.src)0
-rw-r--r--editeng/source/editeng/editobj.cxx (renamed from svx/source/editeng/editobj.cxx)28
-rw-r--r--editeng/source/editeng/editobj2.hxx (renamed from svx/source/editeng/editobj2.hxx)2
-rw-r--r--editeng/source/editeng/editsel.cxx (renamed from svx/source/editeng/editsel.cxx)4
-rw-r--r--editeng/source/editeng/editsel.hxx (renamed from svx/source/editeng/editsel.hxx)0
-rw-r--r--editeng/source/editeng/editstt2.hxx (renamed from svx/source/editeng/editstt2.hxx)2
-rw-r--r--editeng/source/editeng/editundo.cxx (renamed from svx/source/editeng/editundo.cxx)6
-rw-r--r--editeng/source/editeng/editundo.hxx (renamed from svx/source/editeng/editundo.hxx)4
-rw-r--r--editeng/source/editeng/editview.cxx (renamed from svx/source/editeng/editview.cxx)41
-rw-r--r--editeng/source/editeng/edtspell.cxx (renamed from svx/source/editeng/edtspell.cxx)17
-rw-r--r--editeng/source/editeng/edtspell.hxx (renamed from svx/inc/edtspell.hxx)12
-rw-r--r--editeng/source/editeng/eehtml.cxx (renamed from svx/source/editeng/eehtml.cxx)22
-rw-r--r--editeng/source/editeng/eehtml.hxx (renamed from svx/source/editeng/eehtml.hxx)8
-rw-r--r--editeng/source/editeng/eeng_pch.cxx (renamed from svx/source/editeng/eeng_pch.cxx)2
-rw-r--r--editeng/source/editeng/eeng_pch.hxx (renamed from svx/source/editeng/eeng_pch.hxx)6
-rw-r--r--editeng/source/editeng/eeobj.cxx (renamed from svx/source/editeng/eeobj.cxx)4
-rw-r--r--editeng/source/editeng/eeobj.hxx (renamed from svx/source/editeng/eeobj.hxx)0
-rw-r--r--editeng/source/editeng/eerdll.cxx (renamed from svx/source/editeng/eerdll.cxx)73
-rw-r--r--editeng/source/editeng/eerdll2.hxx (renamed from svx/source/editeng/eerdll2.hxx)3
-rw-r--r--editeng/source/editeng/eertfpar.cxx (renamed from svx/source/editeng/eertfpar.cxx)15
-rw-r--r--editeng/source/editeng/eertfpar.hxx (renamed from svx/source/editeng/eertfpar.hxx)2
-rw-r--r--editeng/source/editeng/impedit.cxx (renamed from svx/source/editeng/impedit.cxx)17
-rw-r--r--editeng/source/editeng/impedit.hxx (renamed from svx/source/editeng/impedit.hxx)15
-rw-r--r--editeng/source/editeng/impedit2.cxx (renamed from svx/source/editeng/impedit2.cxx)50
-rw-r--r--editeng/source/editeng/impedit3.cxx (renamed from svx/source/editeng/impedit3.cxx)59
-rw-r--r--editeng/source/editeng/impedit4.cxx (renamed from svx/source/editeng/impedit4.cxx)95
-rw-r--r--editeng/source/editeng/impedit5.cxx (renamed from svx/source/editeng/impedit5.cxx)6
-rw-r--r--editeng/source/editeng/makefile.mk (renamed from svx/source/editeng/makefile.mk)20
-rw-r--r--editeng/source/editeng/textconv.cxx (renamed from svx/source/editeng/textconv.cxx)20
-rw-r--r--editeng/source/editeng/textconv.hxx (renamed from svx/inc/textconv.hxx)8
-rw-r--r--editeng/source/items/bulitem.cxx (renamed from svx/source/items/bulitem.cxx)7
-rw-r--r--editeng/source/items/charhiddenitem.cxx (renamed from svx/source/items/charhiddenitem.cxx)10
-rw-r--r--editeng/source/items/flditem.cxx (renamed from svx/source/items/flditem.cxx)6
-rw-r--r--editeng/source/items/frmitems.cxx (renamed from svx/source/items/frmitems.cxx)414
-rw-r--r--editeng/source/items/itemtype.cxx (renamed from svx/source/items/itemtype.cxx)28
-rw-r--r--editeng/source/items/makefile.mk79
-rw-r--r--editeng/source/items/numitem.cxx (renamed from svx/source/items/numitem.cxx)19
-rw-r--r--editeng/source/items/optitems.cxx (renamed from svx/source/options/optitems.cxx)14
-rw-r--r--editeng/source/items/page.src (renamed from svx/source/items/page.src)2
-rw-r--r--editeng/source/items/paperinf.cxx (renamed from svx/source/items/paperinf.cxx)13
-rw-r--r--editeng/source/items/paraitem.cxx (renamed from svx/source/items/paraitem.cxx)102
-rw-r--r--editeng/source/items/svdfield.cxx (renamed from svx/source/svxlink/linkmgr.src)80
-rw-r--r--editeng/source/items/svxfont.cxx (renamed from svx/source/items/svxfont.cxx)12
-rw-r--r--editeng/source/items/svxitems.src1027
-rw-r--r--editeng/source/items/textitem.cxx (renamed from svx/source/items/textitem.cxx)141
-rw-r--r--editeng/source/items/writingmodeitem.cxx (renamed from svx/source/items/writingmodeitem.cxx)13
-rw-r--r--editeng/source/items/xmlcnitm.cxx (renamed from svx/source/items/xmlcnitm.cxx)6
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectExport.cxx (renamed from svx/source/editeng/SvXMLAutoCorrectExport.cxx)2
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectExport.hxx (renamed from svx/source/editeng/SvXMLAutoCorrectExport.hxx)2
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectImport.cxx (renamed from svx/source/editeng/SvXMLAutoCorrectImport.cxx)2
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectImport.hxx (renamed from svx/source/editeng/SvXMLAutoCorrectImport.hxx)2
-rw-r--r--editeng/source/misc/acorrcfg.cxx (renamed from svx/source/editeng/acorrcfg.cxx)199
-rwxr-xr-xediteng/source/misc/edtdlg.cxx43
-rw-r--r--editeng/source/misc/forbiddencharacterstable.cxx (renamed from svx/source/editeng/forbiddencharacterstable.cxx)8
-rw-r--r--editeng/source/misc/hangulhanja.cxx (renamed from svx/source/dialog/hangulhanja.cxx)17
-rw-r--r--editeng/source/misc/lingu.src104
-rw-r--r--editeng/source/misc/makefile.mk71
-rw-r--r--editeng/source/misc/splwrap.cxx (renamed from svx/source/dialog/splwrap.cxx)55
-rw-r--r--editeng/source/misc/svxacorr.cxx (renamed from svx/source/editeng/svxacorr.cxx)187
-rw-r--r--editeng/source/misc/swafopt.cxx (renamed from svx/source/editeng/swafopt.cxx)10
-rw-r--r--editeng/source/misc/txtrange.cxx (renamed from svx/source/editeng/txtrange.cxx)4
-rw-r--r--editeng/source/misc/unolingu.cxx (renamed from svx/source/editeng/unolingu.cxx)10
-rw-r--r--editeng/source/outliner/makefile.mk (renamed from svx/source/outliner/makefile.mk)2
-rw-r--r--editeng/source/outliner/outl_pch.cxx (renamed from svx/source/outliner/outl_pch.cxx)2
-rw-r--r--editeng/source/outliner/outl_pch.hxx (renamed from svx/source/outliner/outl_pch.hxx)14
-rw-r--r--editeng/source/outliner/outleeng.cxx (renamed from svx/source/outliner/outleeng.cxx)18
-rw-r--r--editeng/source/outliner/outleeng.hxx (renamed from svx/source/outliner/outleeng.hxx)4
-rw-r--r--editeng/source/outliner/outlin2.cxx (renamed from svx/source/outliner/outlin2.cxx)22
-rw-r--r--editeng/source/outliner/outliner.cxx (renamed from svx/source/outliner/outliner.cxx)32
-rw-r--r--editeng/source/outliner/outliner.src (renamed from svx/source/outliner/outliner.src)3
-rw-r--r--editeng/source/outliner/outlobj.cxx (renamed from svx/source/outliner/outlobj.cxx)8
-rw-r--r--editeng/source/outliner/outlundo.cxx (renamed from svx/source/outliner/outlundo.cxx)12
-rw-r--r--editeng/source/outliner/outlundo.hxx (renamed from svx/source/outliner/outlundo.hxx)9
-rw-r--r--editeng/source/outliner/outlvw.cxx (renamed from svx/source/outliner/outlvw.cxx)24
-rw-r--r--editeng/source/outliner/paralist.cxx (renamed from svx/source/outliner/paralist.cxx)6
-rw-r--r--editeng/source/outliner/paralist.hxx (renamed from svx/source/outliner/paralist.hxx)0
-rw-r--r--editeng/source/rtf/makefile.mk (renamed from svx/source/svrtf/makefile.mk)19
-rw-r--r--editeng/source/rtf/rtfgrf.cxx (renamed from svx/source/svrtf/rtfgrf.cxx)7
-rw-r--r--editeng/source/rtf/rtfitem.cxx (renamed from svx/source/svrtf/rtfitem.cxx)118
-rw-r--r--editeng/source/rtf/segincr.asm (renamed from svx/source/svrtf/segincr.asm)0
-rw-r--r--editeng/source/rtf/svxrtf.cxx (renamed from svx/source/svrtf/svxrtf.cxx)12
-rw-r--r--editeng/source/uno/UnoForbiddenCharsTable.cxx (renamed from svx/source/unoedit/UnoForbiddenCharsTable.cxx)8
-rw-r--r--editeng/source/uno/makefile.mk (renamed from svx/source/unoedit/makefile.mk)18
-rw-r--r--editeng/source/uno/unoedhlp.cxx (renamed from svx/source/unoedit/unoedhlp.cxx)8
-rw-r--r--editeng/source/uno/unoedprx.cxx (renamed from svx/source/unoedit/unoedprx.cxx)20
-rw-r--r--editeng/source/uno/unoedsrc.cxx (renamed from svx/source/unoedit/unoedsrc.cxx)4
-rw-r--r--editeng/source/uno/unofdesc.cxx (renamed from svx/source/unodraw/unofdesc.cxx)22
-rw-r--r--editeng/source/uno/unofield.cxx (renamed from svx/source/unoedit/unofield.cxx)78
-rw-r--r--editeng/source/uno/unofored.cxx (renamed from svx/source/unoedit/unofored.cxx)20
-rw-r--r--editeng/source/uno/unoforou.cxx (renamed from svx/source/unoedit/unoforou.cxx)25
-rw-r--r--editeng/source/uno/unoipset.cxx (renamed from svx/source/unodraw/unoipset.cxx)130
-rw-r--r--editeng/source/uno/unonrule.cxx (renamed from svx/source/unodraw/unonrule.cxx)112
-rw-r--r--editeng/source/uno/unopracc.cxx (renamed from svx/source/unoedit/unopracc.cxx)8
-rw-r--r--editeng/source/uno/unotext.cxx (renamed from svx/source/unoedit/unotext.cxx)90
-rw-r--r--editeng/source/uno/unotext2.cxx (renamed from svx/source/unoedit/unotext2.cxx)18
-rw-r--r--editeng/source/uno/unoviwed.cxx (renamed from svx/source/unoedit/unoviwed.cxx)10
-rw-r--r--editeng/source/uno/unoviwou.cxx (renamed from svx/source/unoedit/unoviwou.cxx)10
-rw-r--r--editeng/source/xml/editsource.hxx (renamed from svx/source/xml/editsource.hxx)2
-rw-r--r--editeng/source/xml/makefile.mk (renamed from svx/source/options/makefile.mk)44
-rw-r--r--editeng/source/xml/xmltxtexp.cxx (renamed from svx/source/xml/xmltxtexp.cxx)39
-rw-r--r--editeng/source/xml/xmltxtimp.cxx (renamed from svx/source/xml/xmltxtimp.cxx)15
-rw-r--r--editeng/util/editeng.dxp3
-rw-r--r--editeng/util/hidother.src52
-rw-r--r--editeng/util/makefile.mk102
-rw-r--r--editeng/util/makefile.pmk (renamed from framework/collector/makefile.mk)44
-rw-r--r--embeddedobj/prj/build.lst2
-rw-r--r--embeddedobj/source/msole/graphconvert.cxx124
-rw-r--r--embeddedobj/source/msole/makefile.mk7
-rw-r--r--embeddedobj/source/msole/mtnotification.hxx12
-rw-r--r--embeddedobj/source/msole/olecomponent.cxx32
-rw-r--r--framework/collector/cmduicollector.cxx2719
-rw-r--r--framework/collector/uicmdstohtml.cxx1175
-rw-r--r--framework/inc/acceleratorconst.h8
-rw-r--r--framework/inc/services/layoutmanager.hxx1
-rw-r--r--framework/inc/xml/acceleratorconst.hxx92
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx10
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx7
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs18
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Writer.xcs29
-rw-r--r--oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl4
-rw-r--r--scripting/prj/build.lst5
-rw-r--r--scripting/source/dlgprov/dlgevtatt.cxx27
-rw-r--r--scripting/source/dlgprov/dlgevtatt.hxx5
-rw-r--r--scripting/source/dlgprov/makefile.mk12
-rw-r--r--scripting/source/pyprov/mailmerge.py9
-rwxr-xr-xscripting/source/vbaevents/eventhelper.cxx1042
-rwxr-xr-x[-rw-r--r--]scripting/source/vbaevents/makefile.mk (renamed from shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk)99
-rwxr-xr-xscripting/source/vbaevents/service.cxx131
-rwxr-xr-xscripting/source/vbaevents/vbaevents.map9
-rwxr-xr-xscripting/source/vbaevents/vbaevents.xml26
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx4
-rw-r--r--sfx2/inc/sfx2/dllapi.h2
-rw-r--r--sfx2/inc/sfx2/linkmgr.hxx59
-rw-r--r--sfx2/inc/sfx2/lnkbase.hxx10
-rw-r--r--sfx2/inc/sfx2/module.hxx5
-rw-r--r--sfx2/inc/sfx2/objsh.hxx2
-rw-r--r--sfx2/inc/sfx2/opengrf.hxx (renamed from svx/inc/opengrf.hxx)13
-rw-r--r--sfx2/inc/sfx2/sfxdlg.hxx7
-rw-r--r--sfx2/inc/sfx2/sfxhtml.hxx5
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc152
-rw-r--r--sfx2/inc/sfx2/srchdefs.hxx49
-rw-r--r--sfx2/inc/sfx2/srchitem.hxx303
-rw-r--r--sfx2/inc/sfxhelp.hxx1
-rw-r--r--sfx2/prj/d.lst97
-rw-r--r--sfx2/source/appl/app.hrc12
-rw-r--r--sfx2/source/appl/app.src39
-rw-r--r--sfx2/source/appl/appbas.cxx2
-rw-r--r--sfx2/source/appl/appinit.cxx2
-rw-r--r--sfx2/source/appl/fileobj.cxx (renamed from svx/source/svxlink/fileobj.cxx)35
-rw-r--r--sfx2/source/appl/fileobj.hxx (renamed from svx/source/svxlink/fileobj.hxx)4
-rw-r--r--sfx2/source/appl/linkmgr2.cxx400
-rw-r--r--sfx2/source/appl/lnkbase2.cxx15
-rw-r--r--sfx2/source/appl/makefile.mk4
-rw-r--r--sfx2/source/appl/module.cxx27
-rw-r--r--sfx2/source/appl/opengrf.cxx (renamed from svx/source/dialog/opengrf.cxx)23
-rw-r--r--sfx2/source/appl/sfxhelp.cxx42
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx34
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/dispatch.cxx11
-rw-r--r--sfx2/source/control/makefile.mk1
-rw-r--r--sfx2/source/control/srchitem.cxx662
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/sfxdlg.cxx6
-rw-r--r--sfx2/source/doc/objcont.cxx23
-rw-r--r--sfx2/source/doc/objxtor.cxx1
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/sfxacldetect.cxx0
-rw-r--r--sfx2/source/inc/objshimp.hxx2
-rw-r--r--sfx2/source/inc/speakerdlg.hxx67
-rw-r--r--sfx2/source/menu/virtmenu.cxx30
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/metainforeader.hxx0
-rwxr-xr-xshell/inc/internal/propertyhdl.hxx126
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/shlxthdl.hxx0
-rwxr-xr-xshell/inc/internal/stream_helper.hxx35
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/utilities.hxx0
-rwxr-xr-x[-rw-r--r--]shell/prj/build.lst6
-rw-r--r--[-rwxr-xr-x]shell/prj/d.lst1
-rwxr-xr-xshell/source/all/makefile.mk4
-rw-r--r--shell/source/all/ooofilereader/makefile.mk4
-rw-r--r--shell/source/all/zipfile/makefile.mk4
-rw-r--r--shell/source/win32/makefile.mk2
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/classfactory.cxx0
-rw-r--r--shell/source/win32/shlxthandler/columninfo/makefile.mk2
-rw-r--r--shell/source/win32/shlxthandler/infotips/makefile.mk3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/makefile.mk10
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/makefile.mk13
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx118
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx23
-rw-r--r--shell/source/win32/shlxthandler/ooofilt/proxy/exports.dxp4
-rw-r--r--shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx163
-rwxr-xr-xshell/source/win32/shlxthandler/ooofilt/stream_helper.cxx181
-rwxr-xr-xshell/source/win32/shlxthandler/prophdl/exports.dxp2
-rwxr-xr-xshell/source/win32/shlxthandler/prophdl/makefile.mk130
-rwxr-xr-xshell/source/win32/shlxthandler/prophdl/propertyhdl.cxx459
-rw-r--r--shell/source/win32/shlxthandler/propsheets/makefile.mk2
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/propsheets.cxx55
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/shlxthdl.cxx9
-rw-r--r--shell/source/win32/shlxthandler/thumbviewer/makefile.mk2
-rw-r--r--shell/source/win32/shlxthandler/util/iso8601_converter.cxx4
-rw-r--r--shell/source/win32/shlxthandler/util/makefile.mk2
-rw-r--r--svx/inc/accessibility.hrc4
-rw-r--r--svx/inc/asiancfg.hxx69
-rw-r--r--svx/inc/dlgutil.hxx91
-rw-r--r--svx/inc/galctrl.hxx2
-rw-r--r--svx/inc/helpid.hrc6
-rw-r--r--svx/inc/htmlcfg.hxx101
-rw-r--r--svx/inc/linkmgr.hxx98
-rw-r--r--svx/inc/optextbr.hrc56
-rw-r--r--svx/inc/pch/precompiled_svx.hxx2
-rw-r--r--svx/inc/pszctrl.hxx1
-rw-r--r--svx/inc/srchcfg.hxx82
-rw-r--r--svx/inc/srchdlg.hxx16
-rw-r--r--svx/inc/srchitem.hxx2
-rwxr-xr-xsvx/inc/svx/AccessibleShape.hxx6
-rw-r--r--svx/inc/svx/SpellDialogChildWindow.hxx2
-rw-r--r--svx/inc/svx/algitem.hxx2
-rw-r--r--svx/inc/svx/dialogs.hrc89
-rw-r--r--svx/inc/svx/fntctrl.hxx2
-rw-r--r--svx/inc/svx/frmdirlbox.hxx2
-rw-r--r--svx/inc/svx/grfflt.hxx2
-rw-r--r--svx/inc/svx/impgrf.hxx62
-rw-r--r--svx/inc/svx/langbox.hxx3
-rw-r--r--svx/inc/svx/paraprev.hxx2
-rw-r--r--svx/inc/svx/scene3d.hxx2
-rw-r--r--svx/inc/svx/sdgmoitm.hxx2
-rw-r--r--svx/inc/svx/sdr/attribute/sdrtextattribute.hxx2
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx2
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx2
-rw-r--r--svx/inc/svx/svdetc.hxx2
-rw-r--r--svx/inc/svx/svdfield.hxx36
-rw-r--r--svx/inc/svx/svdmodel.hxx12
-rw-r--r--svx/inc/svx/svdograf.hxx2
-rw-r--r--svx/inc/svx/svdomeas.hxx2
-rw-r--r--svx/inc/svx/svdoutl.hxx2
-rw-r--r--[-rwxr-xr-x]svx/inc/svx/svdpntv.hxx0
-rw-r--r--svx/inc/svx/svx3ditems.hxx2
-rw-r--r--svx/inc/svx/svxbox.hxx202
-rw-r--r--svx/inc/svx/svxdlg.hxx43
-rw-r--r--svx/inc/svx/svxids.hrc137
-rw-r--r--svx/inc/svx/svxitems.hrc409
-rw-r--r--svx/inc/svx/thesdlg.hxx134
-rw-r--r--svx/inc/svx/unomid.hxx154
-rw-r--r--svx/inc/svx/unomod.hxx4
-rw-r--r--svx/inc/svx/unopage.hxx2
-rw-r--r--svx/inc/svx/unoprov.hxx32
-rw-r--r--svx/inc/svx/unoshape.hxx14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unoshprp.hxx11
-rw-r--r--svx/inc/svx/unoshtxt.hxx2
-rw-r--r--svx/inc/svx/xbitmap.hxx2
-rw-r--r--svx/inc/svxerr.hxx8
-rw-r--r--svx/inc/txencbox.hxx6
-rw-r--r--svx/inc/unoapi.hxx21
-rw-r--r--svx/inc/unonrule.hxx46
-rw-r--r--svx/inc/xmlgrhlp.hxx2
-rw-r--r--svx/prj/build.lst22
-rw-r--r--svx/sdi/svx.sdi25
-rw-r--r--svx/sdi/svxslots.hrc4
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx4
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.hxx2
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx2
-rwxr-xr-xsvx/source/accessibility/AccessibleShape.cxx4
-rw-r--r--svx/source/accessibility/AccessibleTextEventQueue.cxx14
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx18
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.hxx9
-rw-r--r--svx/source/accessibility/accessibility.src10
-rwxr-xr-xsvx/source/accessibility/makefile.mk17
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx4
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx20
-rw-r--r--svx/source/dialog/_contdlg.cxx4
-rw-r--r--svx/source/dialog/ctredlin.cxx2
-rw-r--r--svx/source/dialog/dlgutil.cxx927
-rw-r--r--svx/source/dialog/fontwork.cxx8
-rw-r--r--svx/source/dialog/framelink.cxx2
-rw-r--r--svx/source/dialog/hdft.cxx26
-rw-r--r--svx/source/dialog/hyphen.cxx519
-rw-r--r--svx/source/dialog/hyphen.hrc45
-rw-r--r--svx/source/dialog/hyphen.hxx123
-rw-r--r--svx/source/dialog/hyphen.src137
-rw-r--r--svx/source/dialog/hyprdlg.hxx2
-rw-r--r--svx/source/dialog/imapdlg.cxx4
-rw-r--r--svx/source/dialog/impgrf.cxx132
-rw-r--r--svx/source/dialog/impgrf.hrc56
-rw-r--r--svx/source/dialog/impgrf.src150
-rw-r--r--svx/source/dialog/langbox.cxx37
-rw-r--r--svx/source/dialog/lingu.src177
-rw-r--r--svx/source/dialog/makefile.mk18
-rw-r--r--svx/source/dialog/optgrid.cxx (renamed from svx/source/options/optgrid.cxx)3
-rw-r--r--svx/source/dialog/optgrid.hrc (renamed from svx/source/options/optgrid.hrc)0
-rw-r--r--svx/source/dialog/optgrid.src (renamed from svx/source/options/optgrid.src)0
-rw-r--r--svx/source/dialog/pagectrl.cxx4
-rw-r--r--svx/source/dialog/rlrcitem.cxx8
-rw-r--r--svx/source/dialog/sdstring.src26
-rw-r--r--svx/source/dialog/simptabl.cxx2
-rw-r--r--svx/source/dialog/srchctrl.cxx2
-rw-r--r--svx/source/dialog/srchdlg.cxx26
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx10
-rw-r--r--svx/source/dialog/svxbox.cxx620
-rw-r--r--svx/source/dialog/svxdlg.cxx2
-rw-r--r--svx/source/dialog/svxruler.cxx6
-rw-r--r--svx/source/dialog/thesdlg.cxx497
-rw-r--r--svx/source/dialog/thesdlg.hrc59
-rw-r--r--svx/source/dialog/thesdlg.src207
-rw-r--r--svx/source/dialog/txencbox.cxx28
-rw-r--r--svx/source/editeng/editeng.hrc60
-rw-r--r--svx/source/engine3d/deflt3d.cxx2
-rw-r--r--svx/source/engine3d/e3dundo.cxx2
-rw-r--r--svx/source/engine3d/float3d.cxx13
-rw-r--r--svx/source/engine3d/obj3d.cxx6
-rw-r--r--svx/source/engine3d/scene3d.cxx2
-rw-r--r--svx/source/engine3d/view3d.cxx4
-rw-r--r--svx/source/engine3d/view3d1.cxx2
-rw-r--r--svx/source/form/filtnav.cxx2
-rw-r--r--svx/source/form/fmobj.cxx2
-rw-r--r--svx/source/form/fmscriptingenv.cxx5
-rw-r--r--svx/source/form/fmshimp.cxx33
-rw-r--r--svx/source/form/fmtextcontroldialogs.cxx2
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx10
-rw-r--r--svx/source/form/fmundo.cxx99
-rw-r--r--svx/source/form/makefile.mk4
-rw-r--r--svx/source/form/typemap.cxx45
-rw-r--r--svx/source/gallery2/galbrws2.cxx6
-rw-r--r--svx/source/gallery2/galctrl.cxx8
-rw-r--r--svx/source/gallery2/galmisc.cxx4
-rw-r--r--svx/source/inc/fmtextcontroldialogs.hxx2
-rw-r--r--svx/source/inc/fmundo.hxx2
-rw-r--r--svx/source/inc/frmselimpl.hxx2
-rw-r--r--svx/source/items/algitem.cxx2
-rw-r--r--svx/source/items/boxobj.hxx97
-rw-r--r--svx/source/items/grfitem.cxx2
-rw-r--r--svx/source/items/makefile.mk22
-rw-r--r--svx/source/items/pageitem.cxx4
-rw-r--r--svx/source/items/postattr.cxx4
-rw-r--r--svx/source/items/svxerr.src2
-rw-r--r--svx/source/items/svxitems.src1445
-rw-r--r--svx/source/mnuctrls/fntctl.cxx4
-rw-r--r--svx/source/mnuctrls/fntszctl.cxx6
-rw-r--r--svx/source/options/asiancfg.cxx290
-rw-r--r--svx/source/options/htmlcfg.cxx494
-rw-r--r--svx/source/options/srchcfg.cxx289
-rw-r--r--svx/source/outliner/outliner.hrc45
-rw-r--r--svx/source/sdr/attribute/sdrtextattribute.cxx6
-rw-r--r--svx/source/sdr/contact/viewcontactofgraphic.cxx4
-rw-r--r--[-rwxr-xr-x]svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx0
-rw-r--r--svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx6
-rw-r--r--svx/source/sdr/properties/captionproperties.cxx2
-rw-r--r--svx/source/sdr/properties/circleproperties.cxx2
-rw-r--r--svx/source/sdr/properties/connectorproperties.cxx2
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx2
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx2
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx2
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx2
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx2
-rw-r--r--svx/source/sdr/properties/textproperties.cxx10
-rw-r--r--svx/source/src/app.hrc1
-rw-r--r--svx/source/stbctrls/pszctrl.cxx13
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx2
-rw-r--r--svx/source/svdraw/svdattr.cxx12
-rw-r--r--svx/source/svdraw/svdedtv1.cxx2
-rw-r--r--svx/source/svdraw/svdedtv2.cxx6
-rw-r--r--svx/source/svdraw/svdedxv.cxx16
-rw-r--r--svx/source/svdraw/svdetc.cxx10
-rw-r--r--svx/source/svdraw/svdfmtf.cxx28
-rw-r--r--svx/source/svdraw/svdibrow.cxx14
-rw-r--r--svx/source/svdraw/svditext.hxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx20
-rw-r--r--svx/source/svdraw/svdoashp.cxx8
-rw-r--r--svx/source/svdraw/svdoattr.cxx10
-rw-r--r--svx/source/svdraw/svdobj.cxx4
-rw-r--r--svx/source/svdraw/svdocapt.cxx2
-rw-r--r--svx/source/svdraw/svdocirc.cxx2
-rw-r--r--svx/source/svdraw/svdoedge.cxx10
-rw-r--r--svx/source/svdraw/svdograf.cxx21
-rw-r--r--svx/source/svdraw/svdogrp.cxx2
-rw-r--r--svx/source/svdraw/svdomeas.cxx54
-rw-r--r--svx/source/svdraw/svdoole2.cxx9
-rw-r--r--svx/source/svdraw/svdopath.cxx2
-rw-r--r--svx/source/svdraw/svdotext.cxx20
-rw-r--r--svx/source/svdraw/svdotextdecomposition.cxx12
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx4
-rw-r--r--svx/source/svdraw/svdotxat.cxx30
-rw-r--r--svx/source/svdraw/svdotxed.cxx6
-rw-r--r--svx/source/svdraw/svdotxfl.cxx5
-rw-r--r--svx/source/svdraw/svdotxln.cxx22
-rw-r--r--svx/source/svdraw/svdotxtr.cxx2
-rw-r--r--svx/source/svdraw/svdoutl.cxx6
-rw-r--r--svx/source/svdraw/svdpagv.cxx2
-rw-r--r--[-rwxr-xr-x]svx/source/svdraw/svdpntv.cxx6
-rw-r--r--svx/source/svdraw/svdtext.cxx6
-rw-r--r--svx/source/svdraw/svdundo.cxx2
-rw-r--r--svx/source/svdraw/svdview.cxx8
-rw-r--r--svx/source/svdraw/svdxcgv.cxx2
-rw-r--r--svx/source/svxlink/linkmgr.cxx387
-rw-r--r--svx/source/table/accessiblecell.cxx2
-rw-r--r--svx/source/table/accessiblecell.hxx5
-rw-r--r--svx/source/table/cell.cxx42
-rw-r--r--svx/source/table/cell.hxx5
-rw-r--r--svx/source/table/celleditsource.cxx14
-rw-r--r--svx/source/table/celleditsource.hxx2
-rw-r--r--svx/source/table/svdotable.cxx10
-rw-r--r--svx/source/table/tablecontroller.cxx18
-rw-r--r--svx/source/table/tabledesign.cxx5
-rw-r--r--svx/source/table/tablelayouter.cxx4
-rw-r--r--svx/source/table/tablertfexporter.cxx12
-rw-r--r--svx/source/table/tablertfimporter.cxx12
-rw-r--r--svx/source/table/tableundo.cxx2
-rw-r--r--svx/source/table/viewcontactoftableobj.cxx2
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx2
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx2
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx4
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx4
-rw-r--r--svx/source/tbxctrls/itemwin.cxx5
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx20
-rw-r--r--svx/source/toolbars/extrusionbar.cxx2
-rw-r--r--svx/source/toolbars/fontworkbar.cxx6
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx16
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx2
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx4
-rw-r--r--svx/source/unodraw/makefile.mk3
-rw-r--r--svx/source/unodraw/tableshape.cxx4
-rw-r--r--svx/source/unodraw/unobtabl.cxx46
-rw-r--r--svx/source/unodraw/unomod.cxx93
-rw-r--r--svx/source/unodraw/unopage.cxx9
-rw-r--r--svx/source/unodraw/unopool.cxx2
-rw-r--r--svx/source/unodraw/unoprov.cxx85
-rw-r--r--svx/source/unodraw/unoshap2.cxx28
-rw-r--r--svx/source/unodraw/unoshap3.cxx29
-rw-r--r--svx/source/unodraw/unoshap4.cxx14
-rw-r--r--svx/source/unodraw/unoshape.cxx161
-rw-r--r--svx/source/unodraw/unoshcol.cxx3
-rw-r--r--svx/source/unodraw/unoshtxt.cxx21
-rw-r--r--svx/source/xml/makefile.mk2
-rw-r--r--svx/source/xml/xmlgrhlp.cxx12
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx4
-rw-r--r--svx/source/xoutdev/xattr.cxx4
-rw-r--r--svx/source/xoutdev/xattr2.cxx2
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx5
-rw-r--r--svx/util/hidother.src39
-rw-r--r--svx/util/makefile.mk98
-rw-r--r--svx/util/svxpch.cxx2
-rw-r--r--svx/workben/edittest.cxx46
-rw-r--r--svx/workben/makefile.mk1
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx2
-rw-r--r--ucb/source/ucp/gvfs/gvfs_content.cxx36
-rw-r--r--ucb/source/ucp/gvfs/gvfs_directory.cxx24
-rw-r--r--vbahelper/inc/vbahelper/msvbahelper.hxx55
-rw-r--r--vbahelper/prj/build.lst2
-rw-r--r--vbahelper/source/vbahelper/makefile.mk1
-rw-r--r--vbahelper/source/vbahelper/msvbahelper.cxx381
-rw-r--r--vbahelper/source/vbahelper/vbaapplicationbase.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarcontrol.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbahelper.cxx4
-rw-r--r--vbahelper/util/makefile.mk3
-rw-r--r--xmloff/source/core/SettingsExportHelper.cxx8
-rw-r--r--xmloff/source/draw/shapeexport4.cxx2
635 files changed, 10539 insertions, 18901 deletions
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 728c8fef03c4..8b5aaa1c60eb 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -28,6 +28,6 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess
..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx
..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx
#..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
+..\%__SRC%\misc\lang\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
-..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip \ No newline at end of file
+..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 80bb2fac6c2b..52e76f834ab5 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -761,7 +761,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
break;
case TypeClass_BYTE:
{
- sal_Int8 nValue;
+ sal_Int8 nValue(0);
*pRowIter >>= nValue;
aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
}
@@ -769,7 +769,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
case TypeClass_SHORT:
case TypeClass_UNSIGNED_SHORT:
{
- sal_Int16 nValue;
+ sal_Int16 nValue(0);
*pRowIter >>= nValue;
aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
}
@@ -777,7 +777,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
case TypeClass_LONG:
case TypeClass_UNSIGNED_LONG:
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
*pRowIter >>= nValue;
aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
}
@@ -785,21 +785,21 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
case TypeClass_HYPER:
case TypeClass_UNSIGNED_HYPER:
{
- sal_Int64 nValue;
+ sal_Int64 nValue(0);
*pRowIter >>= nValue;
aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
}
break;
case TypeClass_FLOAT:
{
- float nValue;
+ float nValue(0.0);
*pRowIter >>= nValue;
aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
}
break;
case TypeClass_DOUBLE:
{
- double nValue;
+ double nValue(0.0);
*pRowIter >>= nValue;
aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
}
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 1a4a848c9ccf..2884e6179aaa 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -2133,35 +2133,35 @@ void ORowSetValue::fill(const Any& _rValue)
}
case TypeClass_FLOAT:
{
- float aDummy;
+ float aDummy(0.0);
_rValue >>= aDummy;
(*this) = aDummy;
break;
}
case TypeClass_DOUBLE:
{
- double aDummy;
+ double aDummy(0.0);
_rValue >>= aDummy;
(*this) = aDummy;
break;
}
case TypeClass_BYTE:
{
- sal_Int8 aDummy;
+ sal_Int8 aDummy(0);
_rValue >>= aDummy;
(*this) = aDummy;
break;
}
case TypeClass_SHORT:
{
- sal_Int16 aDummy;
+ sal_Int16 aDummy(0);
_rValue >>= aDummy;
(*this) = aDummy;
break;
}
case TypeClass_LONG:
{
- sal_Int32 aDummy;
+ sal_Int32 aDummy(0);
_rValue >>= aDummy;
(*this) = aDummy;
break;
diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk
index 93aaa5c4a725..45d80fc049ff 100755
--- a/connectivity/util/makefile.mk
+++ b/connectivity/util/makefile.mk
@@ -43,7 +43,7 @@ DIR_LANG_SOURCE := $(MISC)$/merge
DIR_LANG_SOURCE := $(MISC)$/registry$/data
.ENDIF
DRIVER_MERGE_XCU := $(shell -@$(FIND) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess -name "*.xcu")
-
+DRIVER_MERGE_DEST = $(MISC)/lang/{$(DRIVER_MERGE_XCU:f)}
REALFILTERPACKAGES_FILTERS_UI_LANGPACKS = \
$(foreach,i,$(alllangiso) $(foreach,j,$(DRIVER_MERGE_XCU) $(DIR_LANGPACK)$/$i$/org$/openoffice$/Office$/DataAccess$/$(j:f)))
@@ -72,5 +72,26 @@ $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip : $(REALFILTERPACKAGES_FILTERS_UI_LANGP
ALLTAR: \
$(MISC)$/$(TARGET)_delzip \
- $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip
+ $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip \
+ $(MISC)/lastlang.mk
+
+.IF "$(DRIVER_MERGE_DEST)"!=""
+.INCLUDE .IGNORE : $(MISC)/lastlang.mk
+
+ALLTAR : \
+ $(DRIVER_MERGE_DEST)
+
+.IF "$(LAST_LANGS)"!="$(WITH_LANG)"
+DO_PHONY=.PHONY
+.ENDIF # "$(LAST_LANG)"!="$(WITH_LANG)"
+
+$(MISC)/lang/%.xcu $(DO_PHONY) : $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess/%.xcu
+ @@-$(MKDIRHIER) $(@:d:d)
+ $(COPY) $< $@
+
+.ENDIF # "$(DRIVER_MERGE_DEST)"!=""
+
+$(MISC)/lastlang.mk $(DO_PHONY) :
+ $(RM) $@
+ echo LAST_LANGS=$(WITH_LANG) > $@
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index f44d6f1276db..8ce57eb3451f 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -146,7 +146,7 @@ bool LanguageSelection::prepareLanguage()
xProp->getPropertyValue(OUString::createFromAscii("ooSetupSystemLocale")) >>= sLocale;
if ( sLocale.getLength() )
{
- loc = LanguageSelection::IsoStringToLocale(aLocaleString);
+ loc = LanguageSelection::IsoStringToLocale(sLocale);
MsLangId::setConfiguredSystemLanguage( MsLangId::convertLocaleToLanguage(loc) );
}
else
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index aa5cf5437c98..d93c5a52c782 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -78,19 +78,6 @@ PersistentMap::~PersistentMap()
}
//______________________________________________________________________________
-void PersistentMap::flush() const
-{
- try {
- int err = m_db.sync(0);
- if (err != 0)
- throw_rtexc(err);
- }
- catch (DbException & exc) {
- throw_rtexc( exc.get_errno(), exc.what() );
- }
-}
-
-//______________________________________________________________________________
PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
: m_db( 0, 0 )
{
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 871401f5260e..85e6eaef3544 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -30,7 +30,6 @@
#include "dp_gui_updatedata.hxx"
#include "dp_misc.h"
-#include "dp_gui_updatability.hxx"
#include "dp_gui.hrc"
#include "rtl/ref.hxx"
#include "rtl/instance.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 6925099cc626..31019948f043 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -765,12 +765,6 @@ ExtMgrDialog::~ExtMgrDialog()
}
//------------------------------------------------------------------------------
-void ExtMgrDialog::selectEntry( long nPos )
-{
- m_pExtensionBox->selectEntry( nPos );
-}
-
-//------------------------------------------------------------------------------
void ExtMgrDialog::setGetExtensionsURL( const ::rtl::OUString &rURL )
{
m_aGetExtensions.SetURL( rURL );
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 51402ecc61ce..d5e939ace8a9 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -159,7 +159,6 @@ public:
virtual void updatePackageInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
void setGetExtensionsURL( const ::rtl::OUString &rURL );
- void selectEntry( long nPos );
virtual long addPackageToList( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &,
const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > & );
bool enablePackage( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager,
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 2d418464528b..58a5ab1c19ea 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -248,7 +248,6 @@ public:
const bool bEnable );
void checkForUpdates( const std::vector< TUpdateListEntry > &vExtensionList );
void stop();
- bool hasTerminated();
bool isBusy();
static OUString searchAndReplaceAll( const OUString &rSource,
@@ -741,13 +740,6 @@ void ExtensionCmdQueue::Thread::stop()
}
//------------------------------------------------------------------------------
-bool ExtensionCmdQueue::Thread::hasTerminated()
-{
- osl::MutexGuard aGuard( m_mutex );
- return m_bTerminated;
-}
-
-//------------------------------------------------------------------------------
bool ExtensionCmdQueue::Thread::isBusy()
{
osl::MutexGuard aGuard( m_mutex );
@@ -1157,17 +1149,6 @@ void ExtensionCmdQueue::stop()
m_thread->stop();
}
-void ExtensionCmdQueue::stopAndWait()
-{
- m_thread->stop();
- m_thread->join();
-}
-
-bool ExtensionCmdQueue::hasTerminated()
-{
- return m_thread->hasTerminated();
-}
-
bool ExtensionCmdQueue::isBusy()
{
return m_thread->isBusy();
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
index 9db4520f6f2f..f984c71c6c1c 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
@@ -92,14 +92,6 @@ public:
*/
void stop();
- /** Determines if thread of this class has terminated.
- */
- bool hasTerminated();
-
- /** Blocks until the thread has terminated. All URLs in the queue will be processed.
- */
- void stopAndWait();
-
bool isBusy();
private:
ExtensionCmdQueue(ExtensionCmdQueue &); // not defined
diff --git a/desktop/source/deployment/gui/dp_gui_updatability.cxx b/desktop/source/deployment/gui/dp_gui_updatability.cxx
deleted file mode 100644
index cf5c75175846..000000000000
--- a/desktop/source/deployment/gui/dp_gui_updatability.cxx
+++ /dev/null
@@ -1,277 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-
-#include "sal/config.h"
-
-#include <cstddef>
-
-#include "com/sun/star/deployment/DeploymentException.hpp"
-#include "com/sun/star/deployment/UpdateInformationProvider.hpp"
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "com/sun/star/deployment/XPackageManager.hpp"
-#include "com/sun/star/deployment/XUpdateInformationProvider.hpp"
-#include "com/sun/star/task/XAbortChannel.hpp"
-#include "com/sun/star/ucb/CommandAbortedException.hpp"
-#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "osl/conditn.hxx"
-#include "osl/diagnose.h"
-#include "osl/mutex.hxx"
-#include "rtl/ref.hxx"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
-#include "vos/mutex.hxx"
-
-#include "dp_misc.h"
-#include "dp_gui_thread.hxx"
-#include "dp_gui_updatability.hxx"
-
-namespace com { namespace sun { namespace star { namespace uno {
- class XComponentContext;
-} } } }
-
-using dp_gui::Updatability;
-
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
-class Updatability::Thread: public dp_gui::Thread {
-public:
- Thread(
- css::uno::Sequence< css::uno::Reference<
- css::deployment::XPackageManager > > const & packageManagers,
- Window & enabled);
-
- void start();
-
- void stop();
-
-private:
- Thread(Thread &); // not defined
- void operator =(Thread &); // not defined
-
- virtual ~Thread();
-
- virtual void execute();
-
- enum Input { NONE, START, STOP };
-
- bool m_predeterminedUpdateUrl;
- css::uno::Sequence< css::uno::Reference<
- css::deployment::XPackageManager > > m_packageManagers;
-
- osl::Condition m_wakeup;
- osl::Mutex m_mutex;
- Window * m_enabled;
- Input m_input;
- css::uno::Reference< css::task::XAbortChannel > m_abort;
-};
-
-Updatability::Thread::Thread(
- css::uno::Sequence< css::uno::Reference<
- css::deployment::XPackageManager > > const & packageManagers,
- Window & enabled):
- m_predeterminedUpdateUrl(dp_misc::getExtensionDefaultUpdateURL().getLength() > 0),
- m_packageManagers(packageManagers),
- m_enabled(&enabled),
- m_input(NONE)
-{}
-
-void Updatability::Thread::start() {
- css::uno::Reference< css::task::XAbortChannel > abort;
- {
- osl::MutexGuard g(m_mutex);
- m_input = START;
- abort = m_abort;
- m_abort.clear();
- }
- m_wakeup.set();
- if (abort.is()) {
- abort->sendAbort();
- }
-}
-
-void Updatability::Thread::stop() {
- css::uno::Reference< css::task::XAbortChannel > abort;
- {
- vos::OGuard g1(Application::GetSolarMutex());
- osl::MutexGuard g2(m_mutex);
- m_input = STOP;
- m_enabled = NULL;
- abort = m_abort;
- m_abort.clear();
- }
- m_wakeup.set();
- if (abort.is()) {
- abort->sendAbort();
- }
-}
-
-Updatability::Thread::~Thread() {}
-
-void Updatability::Thread::execute() {
- for (;;) {
-
- if (m_wakeup.wait() != osl::Condition::result_ok) {
- dp_misc::TRACE("dp_gui::Updatability::Thread::run: ignored \n");
- dp_misc::TRACE("osl::Condition::wait failure\n");
- }
- m_wakeup.reset();
- Input input;
- {
- osl::MutexGuard g(m_mutex);
- input = m_input;
- m_input = NONE;
- }
- if (input == NONE) {
- continue;
- }
- start:
- if (input == STOP) {
- break;
- }
- bool enabled = false;
- for (sal_Int32 i = 0; !enabled && i < m_packageManagers.getLength();
- ++i)
- {
- css::uno::Reference< css::task::XAbortChannel > abort(
- m_packageManagers[i]->createAbortChannel());
- {
- osl::MutexGuard g(m_mutex);
- input = m_input;
- m_input = NONE;
- if (input == NONE) {
- //In case input would be STOP then we would later break out of the loop
- //before further calls to the XPackageManger are done. That is, the abort
- //channel would not be used anyway.
- m_abort = abort;
- }
- if (input != NONE) {
- goto start;
- }
- }
- css::uno::Sequence<
- css::uno::Reference< css::deployment::XPackage > > ps;
- try {
- ps = m_packageManagers[i]->getDeployedPackages(
- abort,
- css::uno::Reference< css::ucb::XCommandEnvironment >());
- } catch (css::deployment::DeploymentException &) {
- // If there are any problematic package managers, enable the
- // update button and let the update process report any problems
- // to the user:
- enabled = true;
- continue;
- } catch (css::ucb::CommandFailedException &) {
- throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "CommandFailedException: cannot happen")),
- css::uno::Reference< css::uno::XInterface >());
- } catch (css::ucb::CommandAbortedException &) {
- osl::MutexGuard g(m_mutex);
- input = m_input;
- m_input = NONE;
- OSL_ASSERT(input != NONE);
- goto start;
- } catch (css::lang::IllegalArgumentException &) {
- throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "IllegalArgumentException: cannot happen")),
- css::uno::Reference< css::uno::XInterface >());
- }
- if (m_predeterminedUpdateUrl && ps.getLength() != 0) {
- enabled = true;
- } else {
- for (sal_Int32 j = 0; j < ps.getLength(); ++j) {
- if (ps[j]->getUpdateInformationURLs().getLength() != 0) {
- enabled = true;
- break;
- }
- {
- osl::MutexGuard g(m_mutex);
- input = m_input;
- m_input = NONE;
- }
- if (input != NONE) {
- goto start;
- }
- }
- }
- }
- vos::OGuard g1(Application::GetSolarMutex());
- Window * e;
- {
- osl::MutexGuard g2(m_mutex);
- e = m_enabled;
- }
- if (e != NULL) {
- e->Enable(enabled);
- }
- }
-}
-
-Updatability::Updatability(
- css::uno::Sequence<
- css::uno::Reference< css::deployment::XPackageManager > > const &
- packageManagers,
- Window & enabled):
- m_thread(new Thread(packageManagers, enabled))
-{
- m_thread->launch();
-}
-
-Updatability::~Updatability() {
-
-}
-
-void Updatability::start() {
- m_thread->start();
-}
-
-void Updatability::stop() {
- m_thread->stop();
- // Bad hack; m_thread calls Application::GetSolarMutex, which only works
- // as long as DeInitVCL has not been called:
- ULONG n = Application::ReleaseSolarMutex();
- m_thread->join();
- Application::AcquireSolarMutex(n);
-}
diff --git a/desktop/source/deployment/gui/dp_gui_updatability.hxx b/desktop/source/deployment/gui/dp_gui_updatability.hxx
deleted file mode 100644
index d255f176127c..000000000000
--- a/desktop/source/deployment/gui/dp_gui_updatability.hxx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATABILITY_HXX
-#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATABILITY_HXX
-
-#include "sal/config.h"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "rtl/ref.hxx"
-
-/// @HTML
-
-class Window;
-namespace com { namespace sun { namespace star {
- namespace deployment { class XPackageManager; }
- namespace uno { class XComponentContext; }
-} } }
-
-namespace dp_gui {
-
-/**
- Asynchronously determine whether <code>dp_gui::DialogImpl</code>'s
- &ldquo;Check for Updates...&rdquo; button shall be enabled (which
- theoretically can take some time).
-
- <p>Note that, due to the asynchronous operation, the button may be enabled
- even if there are no updatable extensions.</p>
-
- <p>Each instance of this class must be called from a single thread in order
- to adhere to the following protocol: <code>stop</code> must be called exactly
- once, with no intervening calls to <code>start</code>, before the destructor
- is called.</p>
-*/
-class Updatability {
-public:
- /**
- Create an instance.
-
- @param packageManagers
- a list of non-null package managers
-
- @param enabled
- <code>dp_gui::DialogImpl</code>'s &ldquo;Check for Updates...&rdquo;
- button; will only be accessed with the solar mutex locked
- */
- Updatability(
- com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
- com::sun::star::deployment::XPackageManager > > const &
- packageManagers,
- Window & enabled);
-
- ~Updatability();
-
- /**
- (Re-)start determining whether <code>dp_gui::DialogImpl</code>'s
- &ldquo;Check for Updates...&rdquo; button shall be enabled.
- */
- void start();
-
- /**
- Orderly shut down this instance.
- */
- void stop();
-
-private:
- Updatability(Updatability &); // not defined
- void operator =(Updatability &); // not defined
-
- class Thread;
-
- rtl::Reference< Thread > m_thread;
-};
-
-}
-
-#endif
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 9b03c4bd1c58..61479f799e6f 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -256,9 +256,9 @@ private:
virtual ~Thread();
virtual void execute();
-
+#if 0
void handleGeneralError(css::uno::Any const & exception) const;
-
+#endif
void handleSpecificError(
css::uno::Reference< css::deployment::XPackage > const & package,
css::uno::Any const & exception) const;
@@ -413,7 +413,7 @@ void UpdateDialog::Thread::execute()
m_dialog.checkingDone();
}
}
-
+#if 0
void UpdateDialog::Thread::handleGeneralError(css::uno::Any const & exception)
const
{
@@ -427,7 +427,7 @@ void UpdateDialog::Thread::handleGeneralError(css::uno::Any const & exception)
m_dialog.addGeneralError(message);
}
}
-
+#endif
//Parameter package can be null
void UpdateDialog::Thread::handleSpecificError(
css::uno::Reference< css::deployment::XPackage > const & package,
@@ -782,7 +782,7 @@ void UpdateDialog::addDisabledUpdate(UpdateDialog::DisabledUpdate const & data)
SvLBoxButtonKind_disabledCheckbox);
// position overflow is rather harmless
}
-
+#if 0
void UpdateDialog::addGeneralError(rtl::OUString const & message) {
std::vector< rtl::OUString >::size_type n = m_generalErrors.size();
m_generalErrors.push_back(message);
@@ -793,7 +793,7 @@ void UpdateDialog::addGeneralError(rtl::OUString const & message) {
UpdateDialog::Index::newGeneralError(n), SvLBoxButtonKind_staticImage);
// position overflow is rather harmless
}
-
+#endif
void UpdateDialog::addSpecificError(UpdateDialog::SpecificError const & data) {
std::vector< UpdateDialog::SpecificError >::size_type n =
m_specificErrors.size();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 8e09ec2f32c7..1a8484e2c20f 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -157,9 +157,9 @@ private:
rtl::OUString const & name, dp_gui::UpdateData const & data);
void addDisabledUpdate(UpdateDialog::DisabledUpdate const & data);
-
+#if 0
void addGeneralError(rtl::OUString const & message);
-
+#endif
void addSpecificError(UpdateDialog::SpecificError const & data);
void checkingDone();
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index 33529ee8ef0f..b55ad49421fc 100644
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -52,7 +52,6 @@ SLOFILES = \
$(SLO)$/license_dialog.obj \
$(SLO)$/dp_gui_dependencydialog.obj \
$(SLO)$/dp_gui_thread.obj \
- $(SLO)$/dp_gui_updatability.obj \
$(SLO)$/dp_gui_updatedialog.obj \
$(SLO)$/dp_gui_updateinstalldialog.obj \
$(SLO)$/dp_gui_autoscrolledit.obj \
diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx
index bf48eaae9d08..13be1e8612fb 100644
--- a/desktop/source/deployment/inc/dp_dependencies.hxx
+++ b/desktop/source/deployment/inc/dp_dependencies.hxx
@@ -63,20 +63,6 @@ namespace Dependencies {
check(::dp_misc::DescriptionInfoset const & infoset);
/**
- Obtain the (human-readable) name of a dependency.
-
- @param dependency
- a dependency represented as a non-null XML element
-
- @return
- the name of the dependency; will never be empty, as a localized
- &ldquo;unknown&rdquo; is substituted for an empty/missing name
- */
- DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString name(
- ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::dom::XElement > const & dependency);
-
- /**
Obtain the (human-readable) error message of a failed dependency.
@param dependency
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index c91bea6dc841..bb3f58269e62 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -53,8 +53,6 @@ public:
/** in mem db */
PersistentMap();
- void flush() const;
-
bool has( ::rtl::OString const & key ) const;
bool get( ::rtl::OString * value, ::rtl::OString const & key ) const;
t_string2string_map getEntries() const;
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index a21522e78252..63badbb0c211 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -127,18 +127,6 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
return unsatisfied;
}
-::rtl::OUString
-name(css::uno::Reference< css::xml::dom::XElement > const & dependency) {
- ::rtl::OUString n(
- dependency->getAttributeNS(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(xmlNamespace)),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name"))));
- return n.getLength() == 0
- ? ::rtl::OUString(
- ::String(::dp_misc::getResId(RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN)))
- : n;
-}
-
::rtl::OUString getErrorText( css::uno::Reference< css::xml::dom::XElement > const & dependency )
{
::rtl::OUString sReason;
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 3940a7e62876..3ed2d554b59f 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -436,19 +436,19 @@ OUString readConsole()
{
OSL_ASSERT((dwRead % 2) == 0);
OUString value( aBuffer, dwRead / 2);
- value = value.trim();
- return value;
+ return value.trim();
}
- return OUString();
-
#else
char buf[1024];
rtl_zeroMemory(buf, 1024);
// read one char less so that the last char in buf is always zero
- fgets(buf, 1024, stdin);
- OUString value = ::rtl::OStringToOUString(::rtl::OString(buf), osl_getThreadTextEncoding());
- return value.trim();
+ if (fgets(buf, 1024, stdin) != NULL)
+ {
+ OUString value = ::rtl::OStringToOUString(::rtl::OString(buf), osl_getThreadTextEncoding());
+ return value.trim();
+ }
#endif
+ return OUString();
}
void TRACE(::rtl::OUString const & sText)
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index f54a449afbf4..0aadc92827bb 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -94,27 +94,20 @@ WelcomePage::WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_B
_setBold(m_ftHead);
checkEval();
- // we need to choose the welcome text that is diplayed
- // choices are the default text, default text+migradtion,
- // OEM and extended OEM
- // No OEM is built, remove the check
-// switch (checkOEM())
-// {
-// case OEM_NONE:
- // check for migration
- if (Migration::checkMigration())
- {
- String aText(WizardResId(STR_WELCOME_MIGRATION));
- // replace %OLDPRODUCT with found version name
- aText.SearchAndReplaceAll( UniString::CreateFromAscii("%OLD_VERSION"), Migration::getOldVersionName());
- m_ftBody.SetText( aText );
- }
- else
- if ( ! m_bLicenseNeedsAcceptance )
- {
- String aText(WizardResId(STR_WELCOME_WITHOUT_LICENSE));
- m_ftBody.SetText( aText );
- }
+
+ // check for migration
+ if (Migration::checkMigration())
+ {
+ String aText(WizardResId(STR_WELCOME_MIGRATION));
+ // replace %OLDPRODUCT with found version name
+ aText.SearchAndReplaceAll( UniString::CreateFromAscii("%OLD_VERSION"), Migration::getOldVersionName());
+ m_ftBody.SetText( aText );
+ }
+ else if ( ! m_bLicenseNeedsAcceptance )
+ {
+ String aText(WizardResId(STR_WELCOME_WITHOUT_LICENSE));
+ m_ftBody.SetText( aText );
+ }
}
@@ -622,84 +615,4 @@ void RegistrationPage::executeSingleMode()
::utl::RegOptions().removeReminder();
}
-// -----------------------------------------------------------------------
-
-static char const OEM_PRELOAD_SECTION[] = "Bootstrap";
-static char const OEM_PRELOAD[] = "Preload";
-static char const STR_TRUE[] = "1";
-static char const STR_FALSE[] = "0";
-
-static sal_Bool existsURL( OUString const& _sURL )
-{
- using namespace osl;
- DirectoryItem aDirItem;
-
- if (_sURL.getLength() != 0)
- return ( DirectoryItem::get( _sURL, aDirItem ) == DirectoryItem::E_None );
-
- return sal_False;
-}
-
-
-// locate soffice.ini/.rc file
-static OUString locateIniFile()
-{
- OUString aUserDataPath;
- OUString aSofficeIniFileURL;
-
- // Retrieve the default file URL for the soffice.ini/rc
- rtl::Bootstrap().getIniName( aSofficeIniFileURL );
-
- if ( utl::Bootstrap::locateUserData( aUserDataPath ) == utl::Bootstrap::PATH_EXISTS )
- {
- const char CONFIG_DIR[] = "/config";
-
- sal_Int32 nIndex = aSofficeIniFileURL.lastIndexOf( '/');
- if ( nIndex > 0 )
- {
- OUString aUserSofficeIniFileURL;
- OUStringBuffer aBuffer( aUserDataPath );
- aBuffer.appendAscii( CONFIG_DIR );
- aBuffer.append( aSofficeIniFileURL.copy( nIndex ));
- aUserSofficeIniFileURL = aBuffer.makeStringAndClear();
-
- if ( existsURL( aUserSofficeIniFileURL ))
- return aUserSofficeIniFileURL;
- }
- }
- // Fallback try to use the soffice.ini/rc from program folder
- return aSofficeIniFileURL;
-}
-
-// check whether the OEMPreload flag was set in soffice.ini/.rc
-static sal_Int32 checkOEMPreloadFlag()
-{
- OUString aSofficeIniFileURL;
- aSofficeIniFileURL = locateIniFile();
- Config aConfig(aSofficeIniFileURL);
- aConfig.SetGroup( OEM_PRELOAD_SECTION );
- ByteString sResult = aConfig.ReadKey( OEM_PRELOAD );
- return sResult.ToInt32();
- /*
- if ( sResult == STR_TRUE )
- return sal_True;
- else
- return sal_False;
- */
-}
-
-WelcomePage::OEMType WelcomePage::checkOEM()
-{
- sal_Int32 oemResult = checkOEMPreloadFlag();
- switch (oemResult) {
- case 1:
- return OEM_NORMAL;
- case 2:
- return OEM_EXTENDED;
- default:
- return OEM_NONE;
- }
-}
-
} // namespace desktop
-
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index 1566b9e93278..c1e8b2c62e42 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -51,7 +51,6 @@ private:
{
OEM_NONE, OEM_NORMAL, OEM_EXTENDED
};
- OEMType checkOEM();
bool bIsEvalVersion;
bool bNoEvalText;
void checkEval();
diff --git a/desktop/source/migration/services/extensionmigration.cxx b/desktop/source/migration/services/extensionmigration.cxx
index ca765cd4826e..a926f17c0c19 100755
--- a/desktop/source/migration/services/extensionmigration.cxx
+++ b/desktop/source/migration/services/extensionmigration.cxx
@@ -241,16 +241,6 @@ namespace migration
}
}
- void ExtensionMigration::registerConfigurationPackage( const uno::Reference< deployment::XPackage > & xPkg)
- {
- const ::rtl::OUString sMediaType = xPkg->getPackageType()->getMediaType();
- if ( (sMediaType.equals(sConfigurationDataType) || sMediaType.equals(sConfigurationSchemaType) ) )
- {
- xPkg->revokePackage(uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment> ());
- xPkg->registerPackage(uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment> ());
- }
- }
-
bool ExtensionMigration::processExtensions( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir )
{
if (!copy(sSourceDir, sTargetDir))
diff --git a/desktop/source/migration/services/extensionmigration.hxx b/desktop/source/migration/services/extensionmigration.hxx
index 915fe46780c7..70f6a4c44c9b 100755
--- a/desktop/source/migration/services/extensionmigration.hxx
+++ b/desktop/source/migration/services/extensionmigration.hxx
@@ -98,8 +98,6 @@ namespace migration
::com::sun::star::deployment::XPackage > & xPkg);
void registerBasicPackage(
const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > & xPkg);
- void registerConfigurationPackage(
- const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > & xPkg);
public:
ExtensionMigration(::com::sun::star::uno::Reference<
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 65b36d668e97..381b6cb378c1 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -238,15 +238,6 @@ css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames()
return css::uno::Sequence< OUString >( &str_name, 1 );
}
-css::uno::Reference< css::uno::XInterface > SAL_CALL jvmfwk_create(
- css::uno::Reference< css::uno::XComponentContext > const & )
- throw (css::uno::Exception)
-{
- return static_cast< ::cppu::OWeakObject * >(new JavaMigration);
-
-}
-
-
// XServiceInfo
OUString SAL_CALL JavaMigration::getImplementationName()
throw (css::uno::RuntimeException)
diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx
index 2159f5514f87..a79d36b8b86b 100644
--- a/desktop/source/migration/services/jvmfwk.hxx
+++ b/desktop/source/migration/services/jvmfwk.hxx
@@ -42,16 +42,9 @@ namespace css = com::sun::star;
namespace migration
{
-
rtl::OUString jvmfwk_getImplementationName();
css::uno::Sequence< rtl::OUString > jvmfwk_getSupportedServiceNames();
-
-css::uno::Reference< css::uno::XInterface > SAL_CALL jvmfwk_create(
- css::uno::Reference< css::uno::XComponentContext > const & )
- throw (css::uno::Exception);
-
-
} //end blind namespace
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
index cbdb211f45d4..323b823fe3b1 100644
--- a/desktop/source/migration/services/makefile.mk
+++ b/desktop/source/migration/services/makefile.mk
@@ -50,8 +50,7 @@ SLOFILES= \
$(SLO)$/cexports.obj \
$(SLO)$/basicmigration.obj \
$(SLO)$/wordbookmigration.obj \
- $(SLO)$/extensionmigration.obj \
- $(SLO)$/autocorrmigration.obj
+ $(SLO)$/extensionmigration.obj
SHL1TARGET=$(TARGET)
SHL1VERSIONMAP = migrationoo2.map
diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
index 8dbb5893d2d4..edc27751b110 100644..100755
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
@@ -1978,7 +1978,30 @@ boolean SetupAppX::InstallRuntimes()
TCHAR *sRuntimePath = 0;
SYSTEM_INFO siSysInfo;
- GetNativeSystemInfo(&siSysInfo);
+ HMODULE hKernel32 = ::LoadLibrary(_T("Kernel32.dll"));
+ if ( hKernel32 != NULL )
+ {
+ typedef void (CALLBACK* pfnGetNativeSystemInfo_t)(LPSYSTEM_INFO);
+ pfnGetNativeSystemInfo_t pfnGetNativeSystemInfo;
+ pfnGetNativeSystemInfo = (pfnGetNativeSystemInfo_t)::GetProcAddress(hKernel32, "GetNativeSystemInfo");
+ if ( pfnGetNativeSystemInfo != NULL )
+ {
+ pfnGetNativeSystemInfo(&siSysInfo);
+ }
+ else
+ {
+ // GetNativeSystemInfo does not exist. Maybe the code is running under Windows 2000.
+ // Use GetSystemInfo instead.
+ GetSystemInfo(&siSysInfo);
+ }
+ FreeLibrary(hKernel32);
+ }
+ else
+ {
+ // Failed to check Kernel32.dll. There may be something wrong.
+ // Use GetSystemInfo instead anyway.
+ GetSystemInfo(&siSysInfo);
+ }
OutputDebugStringFormat( TEXT( "found architecture<%d>\r\n" ), siSysInfo.wProcessorArchitecture );
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
index 4816b7ecbd64..00b44b4515f0 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
@@ -30,7 +30,7 @@
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/drawinglayer/prj/build.lst b/drawinglayer/prj/build.lst
index e3d36cc5cc28..d685c262e337 100644
--- a/drawinglayer/prj/build.lst
+++ b/drawinglayer/prj/build.lst
@@ -1,4 +1,4 @@
-dl drawinglayer : goodies sal vcl basegfx offuh cppuhelper cppu svtools avmedia canvas cppcanvas NULL
+dl drawinglayer : sal vcl basegfx offuh cppuhelper cppu svtools avmedia canvas cppcanvas NULL
dl drawinglayer usr1 - all dl_mkout NULL
dl drawinglayer\inc nmake - all dl_inc NULL
dl drawinglayer\prj get - all dl_prj NULL
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index d75d2d629490..82af04b5ffe6 100644
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -33,7 +33,7 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
#include <avmedia/mediawindow.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
#include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
index 266085caf86a..db61e0721ef0 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
@@ -29,7 +29,7 @@
#include "precompiled_drawinglayer.hxx"
#include <vclhelperbitmaprender.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/range/b2drange.hxx>
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index e75da5c723be..39db8624f882 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -603,7 +603,7 @@ namespace drawinglayer
if(mpPDFExtOutDevData && !bSuppressPDFExtOutDevDataSupport)
{
// emulate data handling from UnoControlPDFExportContact, original see
- // goodies/source/graphic/grfmgr.cxx
+ // svtools/source/graphic/grfmgr.cxx
const Graphic& rGraphic = rGraphicPrimitive.getGraphicObject().GetGraphic();
if(rGraphic.IsLink())
@@ -631,7 +631,7 @@ namespace drawinglayer
if(bUsingPDFExtOutDevData)
{
// emulate data handling from UnoControlPDFExportContact, original see
- // goodies/source/graphic/grfmgr.cxx
+ // svtools/source/graphic/grfmgr.cxx
const basegfx::B2DRange aCurrentRange(
aTranslate.getX(), aTranslate.getY(),
aTranslate.getX() + aScale.getX(), aTranslate.getY() + aScale.getY());
diff --git a/drawinglayer/util/makefile.mk b/drawinglayer/util/makefile.mk
index e5fe77b2a3f0..3de5c47603f1 100644
--- a/drawinglayer/util/makefile.mk
+++ b/drawinglayer/util/makefile.mk
@@ -51,7 +51,6 @@ SHL1TARGET= drawinglayer$(DLLPOSTFIX)
SHL1IMPLIB= idrawinglayer
SHL1STDLIBS=\
- $(GOODIESLIB) \
$(VCLLIB) \
$(BASEGFXLIB) \
$(TOOLSLIB) \
diff --git a/editeng/inc/editeng.hrc b/editeng/inc/editeng.hrc
new file mode 100644
index 000000000000..cc1f45c06da3
--- /dev/null
+++ b/editeng/inc/editeng.hrc
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDITENG_HRC
+#define _EDITENG_HRC
+
+#include <editeng/editrids.hrc>
+
+#define MN_SPELLING 1
+#define MN_INSERT 2
+#define MN_IGNORE 3
+#define MN_AUTOCORR 4
+#define MN_WORDLANGUAGE 5
+#define MN_PARALANGUAGE 6
+
+#define MN_ALTSTART 1000
+#define MN_AUTOSTART 2000
+#define MN_DICTSTART 3000
+
+#endif // _EDITENG_HRC
diff --git a/svx/inc/svx/AccessibleComponentBase.hxx b/editeng/inc/editeng/AccessibleComponentBase.hxx
index 561871335ec7..c3d299c9a17e 100644
--- a/svx/inc/svx/AccessibleComponentBase.hxx
+++ b/editeng/inc/editeng/AccessibleComponentBase.hxx
@@ -33,7 +33,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
#include <com/sun/star/awt/XFocusListener.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
namespace accessibility {
@@ -46,7 +46,7 @@ namespace accessibility {
<type>XAccessibleContext</type>, <type>XInterface</type>,
<type>XServiceInfo</type>, and <type>XTypeProvider</type>.
*/
-class SVX_DLLPUBLIC AccessibleComponentBase
+class EDITENG_DLLPUBLIC AccessibleComponentBase
: public ::com::sun::star::accessibility::XAccessibleExtendedComponent
{
public:
diff --git a/svx/inc/svx/AccessibleContextBase.hxx b/editeng/inc/editeng/AccessibleContextBase.hxx
index 1f2b4efaca21..2358e8120917 100644
--- a/svx/inc/svx/AccessibleContextBase.hxx
+++ b/editeng/inc/editeng/AccessibleContextBase.hxx
@@ -28,7 +28,7 @@
#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_CONTEXT_BASE_HXX
#define _SVX_ACCESSIBILITY_ACCESSIBLE_CONTEXT_BASE_HXX
-#include <svx/ChildrenManager.hxx>
+//#include <editeng/ChildrenManager.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
@@ -36,9 +36,7 @@
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_IllegalAccessibleComponentStateException_HPP_
#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
-#endif
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <cppuhelper/weak.hxx>
@@ -48,7 +46,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <osl/mutex.hxx>
#include <cppuhelper/compbase4.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
namespace accessibility {
@@ -61,7 +59,7 @@ struct MutexOwner {mutable ::osl::Mutex maMutex;};
<type>XXAccessible<type> and <type>XAccessibleContextContext</type>
interfaces it supports the <type>XServiceInfo</type> interface.
*/
-class SVX_DLLPUBLIC AccessibleContextBase
+class EDITENG_DLLPUBLIC AccessibleContextBase
: public MutexOwner,
public cppu::WeakComponentImplHelper4<
::com::sun::star::accessibility::XAccessible,
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index af60ae4695cd..2588850b4565 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -46,9 +46,10 @@
#include <comphelper/accessibletexthelper.hxx>
#include <comphelper/broadcasthelper.hxx>
-#include "AccessibleParaManager.hxx"
-#include "AccessibleImageBullet.hxx"
-#include "unoedprx.hxx"
+#include "editeng/AccessibleParaManager.hxx"
+#include "editeng/AccessibleImageBullet.hxx"
+#include "editeng/unoedprx.hxx"
+#include "editeng/editengdllapi.h"
namespace accessibility
{
@@ -63,7 +64,7 @@ namespace accessibility
/** This class implements the actual text paragraphs for the EditEngine/Outliner UAA
*/
- class AccessibleEditableTextPara : public ::comphelper::OBaseMutex, public AccessibleTextParaInterfaceBase, public ::comphelper::OCommonAccessibleText
+ class EDITENG_DLLPUBLIC AccessibleEditableTextPara : public ::comphelper::OBaseMutex, public AccessibleTextParaInterfaceBase, public ::comphelper::OCommonAccessibleText
{
protected:
diff --git a/svx/source/accessibility/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx
index 392852902d38..c21f7b67f6d5 100644
--- a/svx/source/accessibility/AccessibleImageBullet.hxx
+++ b/editeng/inc/editeng/AccessibleImageBullet.hxx
@@ -41,8 +41,8 @@
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include "AccessibleParaManager.hxx"
-#include <svx/unoedsrc.hxx>
+#include "editeng/AccessibleParaManager.hxx"
+#include <editeng/unoedsrc.hxx>
namespace accessibility
{
diff --git a/svx/source/accessibility/AccessibleParaManager.hxx b/editeng/inc/editeng/AccessibleParaManager.hxx
index 9bef302c67d3..d973bd8d1267 100644
--- a/svx/source/accessibility/AccessibleParaManager.hxx
+++ b/editeng/inc/editeng/AccessibleParaManager.hxx
@@ -37,6 +37,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include "editeng/editengdllapi.h"
class SvxEditSourceAdapter;
@@ -141,7 +142,7 @@ namespace accessibility
To facilitate automatic deletion of paragraphs no longer used,
this class uses the WeakCppRef helper to hold the objects weakly.
*/
- class AccessibleParaManager
+ class EDITENG_DLLPUBLIC AccessibleParaManager
{
public:
typedef WeakCppRef < ::com::sun::star::accessibility::XAccessible, AccessibleEditableTextPara > WeakPara;
diff --git a/svx/inc/AccessibleSelectionBase.hxx b/editeng/inc/editeng/AccessibleSelectionBase.hxx
index 7ff49cf75046..abe92355911b 100644
--- a/svx/inc/AccessibleSelectionBase.hxx
+++ b/editeng/inc/editeng/AccessibleSelectionBase.hxx
@@ -29,7 +29,7 @@
#define _SVX_ACCESSIBILITY_ACCESSIBLE_SELECTION_BASE_HXX
#include <comphelper/accessibleselectionhelper.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
namespace accessibility
{
@@ -44,7 +44,7 @@ namespace accessibility
<method>implIsSelected</method>,
<method>implSelect</method>,
*/
- class SVX_DLLPUBLIC AccessibleSelectionBase : public ::comphelper::OCommonAccessibleSelection,
+ class EDITENG_DLLPUBLIC AccessibleSelectionBase : public ::comphelper::OCommonAccessibleSelection,
public ::com::sun::star::accessibility::XAccessibleSelection
{
protected:
diff --git a/svx/inc/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
index 13ba0be98918..6e4fc1cdccd5 100644
--- a/svx/inc/AccessibleStaticTextBase.hxx
+++ b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
@@ -2,10 +2,13 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
+ * $RCSfile: AccessibleStaticTextBase.hxx,v $
+ * $Revision: 1.14 $
+ *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,7 +40,7 @@
#include <com/sun/star/accessibility/XAccessibleText.hpp>
#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
#include <com/sun/star/accessibility/TextSegment.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class SvxEditSource;
@@ -95,7 +98,7 @@ namespace accessibility
edit source. Every interface method will then properly throw
an exception.
*/
- class SVX_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE
+ class EDITENG_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE
{
public:
@@ -115,9 +118,9 @@ namespace accessibility
private:
// declared, but not defined
- SVX_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
+ EDITENG_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
// declared, but not defined
- SVX_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
+ EDITENG_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
public:
/** Query the current edit source
diff --git a/svx/source/inc/AccessibleStringWrap.hxx b/editeng/inc/editeng/AccessibleStringWrap.hxx
index 9cb9935aa162..1d858f1bdf10 100644
--- a/svx/source/inc/AccessibleStringWrap.hxx
+++ b/editeng/inc/editeng/AccessibleStringWrap.hxx
@@ -31,7 +31,7 @@
#include <sal/types.h>
#include <tools/string.hxx>
-#include <svx/svxdllapi.h>
+#include <editeng/editengdllapi.h>
class OutputDevice;
class SvxFont;
@@ -48,10 +48,10 @@ class AccessibleStringWrap
{
public:
- SVX_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText );
+ EDITENG_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText );
- SVX_DLLPUBLIC sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
- SVX_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint );
+ EDITENG_DLLPUBLIC sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
+ EDITENG_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint );
private:
diff --git a/svx/inc/svx/SpellPortions.hxx b/editeng/inc/editeng/SpellPortions.hxx
index e59d6ddd6af2..e59d6ddd6af2 100644
--- a/svx/inc/svx/SpellPortions.hxx
+++ b/editeng/inc/editeng/SpellPortions.hxx
diff --git a/svx/inc/UnoForbiddenCharsTable.hxx b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
index 8517204fdf83..7f7c0cdd6253 100644
--- a/svx/inc/UnoForbiddenCharsTable.hxx
+++ b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
@@ -33,11 +33,11 @@
#include <vos/ref.hxx>
#include <cppuhelper/implbase2.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class SvxForbiddenCharactersTable;
-class SVX_DLLPUBLIC SvxUnoForbiddenCharsTable : public cppu::WeakImplHelper2<
+class EDITENG_DLLPUBLIC SvxUnoForbiddenCharsTable : public cppu::WeakImplHelper2<
com::sun::star::i18n::XForbiddenCharacters,
com::sun::star::linguistic2::XSupportedLocales>
{
diff --git a/svx/inc/acorrcfg.hxx b/editeng/inc/editeng/acorrcfg.hxx
index 1e0590ce54f2..9427a0c8fcaf 100644
--- a/svx/inc/acorrcfg.hxx
+++ b/editeng/inc/editeng/acorrcfg.hxx
@@ -29,14 +29,14 @@
// include ---------------------------------------------------------------
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
#include <unotools/configitem.hxx>
/* -----------------------------12.10.00 11:40--------------------------------
---------------------------------------------------------------------------*/
class SvxAutoCorrect;
class SvxAutoCorrCfg;
-class SVX_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem
+class EDITENG_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem
{
SvxAutoCorrCfg& rParent;
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
@@ -53,7 +53,7 @@ public:
/* -----------------------------12.10.00 11:40--------------------------------
---------------------------------------------------------------------------*/
-class SVX_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem
+class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem
{
SvxAutoCorrCfg& rParent;
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
@@ -70,7 +70,7 @@ public:
/*--------------------------------------------------------------------
Beschreibung: Konfiguration fuer Auto Correction
--------------------------------------------------------------------*/
-class SVX_DLLPUBLIC SvxAutoCorrCfg
+class EDITENG_DLLPUBLIC SvxAutoCorrCfg
{
friend class SvxBaseAutoCorrCfg;
friend class SvxSwAutoCorrCfg;
diff --git a/svx/inc/svx/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
index 845bd423e6a7..d86cf23f274a 100644
--- a/svx/inc/svx/adjitem.hxx
+++ b/editeng/inc/editeng/adjitem.hxx
@@ -30,13 +30,9 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include <svx/eeitem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -52,7 +48,7 @@ Dieses Item beschreibt die Zeilenausrichtung.
*/
#define ADJUST_LASTBLOCK_VERSION ((USHORT)0x0001)
-class SVX_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
{
BOOL bLeft : 1;
BOOL bRight : 1;
diff --git a/svx/inc/svx/akrnitem.hxx b/editeng/inc/editeng/akrnitem.hxx
index 42b5382b19c7..e574c61207c1 100644
--- a/svx/inc/svx/akrnitem.hxx
+++ b/editeng/inc/editeng/akrnitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -48,7 +45,7 @@ namespace rtl
Attribut fuer Pair-Kerning.
*/
-class SVX_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/blnkitem.hxx b/editeng/inc/editeng/blnkitem.hxx
index 3342f9287e73..f1160c42b67d 100644
--- a/svx/inc/svx/blnkitem.hxx
+++ b/editeng/inc/editeng/blnkitem.hxx
@@ -31,10 +31,7 @@
#include <svl/poolitem.hxx>
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +46,7 @@ namespace rtl
Dieses Item beschreibt, ob geblinkt werden soll.
*/
-class SVX_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
index 504b963ef7a8..e932434e2a23 100644
--- a/svx/inc/bolnitem.hxx
+++ b/editeng/inc/editeng/bolnitem.hxx
@@ -32,7 +32,7 @@
#include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
@@ -46,7 +46,7 @@ Dieses Item transportiert eine SvxBorderLine.
class SvxBorderLine;
-class SVX_DLLPUBLIC SvxLineItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxLineItem : public SfxPoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/borderline.hxx b/editeng/inc/editeng/borderline.hxx
index caea3e85d807..10d27f176d85 100644
--- a/svx/inc/svx/borderline.hxx
+++ b/editeng/inc/editeng/borderline.hxx
@@ -30,7 +30,7 @@
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// Line defaults in twips (former Writer defaults):
@@ -90,7 +90,7 @@
// ============================================================================
-class SVX_DLLPUBLIC SvxBorderLine
+class EDITENG_DLLPUBLIC SvxBorderLine
{
protected:
Color aColor;
diff --git a/svx/inc/svx/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
index 54490601bb95..4d13f7ef4dc9 100644
--- a/svx/inc/svx/boxitem.hxx
+++ b/editeng/inc/editeng/boxitem.hxx
@@ -28,11 +28,9 @@
#define _SVX_BOXITEM_HXX
#include <svl/poolitem.hxx>
-#include <svx/borderline.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/borderline.hxx>
+#include <editeng/editengdllapi.h>
+#include <com/sun/star/table/BorderLine.hpp>
namespace rtl { class OUString; }
@@ -51,7 +49,7 @@ Abstand nach innen.
#define BOX_4DISTS_VERSION ((USHORT)1)
-class SVX_DLLPUBLIC SvxBoxItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
{
SvxBorderLine *pTop,
*pBottom,
@@ -108,6 +106,8 @@ public:
//JP 09.06.99: bIgnoreLine = TRUE -> Distance auch returnen, wenn
// keine Line gesetzt ist
USHORT CalcLineSpace( USHORT nLine, BOOL bIgnoreLine = FALSE ) const;
+ static com::sun::star::table::BorderLine SvxLineToLine( const SvxBorderLine* pLine, sal_Bool bConvert );
+ static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert);
};
inline void SvxBoxItem::SetDistance( USHORT nNew )
@@ -138,7 +138,7 @@ horizontalen und vertikalen innerern Linien transportiert.
#define VALID_DISTANCE 0x40
#define VALID_DISABLE 0x80
-class SVX_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
{
SvxBorderLine* pHori; //innere horizontale Linie
SvxBorderLine* pVert; //innere vertikale Linie
diff --git a/svx/inc/svx/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
index 71c9c08ae6b1..2a295b2201b4 100644
--- a/svx/inc/svx/brkitem.hxx
+++ b/editeng/inc/editeng/brkitem.hxx
@@ -30,11 +30,8 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
namespace rtl
{
@@ -50,7 +47,7 @@ namespace rtl
*/
#define FMTBREAK_NOAUTO ((USHORT)0x0001)
-class SVX_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
index 3e45d6a60727..14b11b97a5e7 100644
--- a/svx/inc/svx/brshitem.hxx
+++ b/editeng/inc/editeng/brshitem.hxx
@@ -30,18 +30,14 @@
// include ---------------------------------------------------------------
#include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
#include <vcl/wall.hxx>
#include <tools/link.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxBrushItem ----------------------------------------------------
class Graphic;
class GraphicObject;
-class SfxObjectShell;
class CntWallpaperItem;
namespace rtl
{
@@ -63,7 +59,7 @@ enum SvxGraphicPosition
#define PARA_DEST_CHAR 1
class SvxBrushItem_Impl;
-class SVX_DLLPUBLIC SvxBrushItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
{
Color aColor;
SvxBrushItem_Impl* pImpl;
@@ -122,8 +118,8 @@ public:
void PurgeGraphic() const;
void PurgeMedium() const;
- const Graphic* GetGraphic( SfxObjectShell* pSh = 0) const;
- const GraphicObject* GetGraphicObject( SfxObjectShell* pSh = 0) const;
+ const Graphic* GetGraphic() const;
+ const GraphicObject* GetGraphicObject() const;
const String* GetGraphicLink() const { return pStrLink; }
const String* GetGraphicFilter() const { return pStrFilter; }
@@ -135,7 +131,6 @@ public:
SvxBrushItem& operator=( const SvxBrushItem& rItem);
- //static void InitSfxLink();
static SvxGraphicPosition WallpaperStyle2GraphicPos( WallpaperStyle eStyle );
static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos );
CntWallpaperItem* CreateCntWallpaperItem() const;
diff --git a/svx/inc/bulitem.hxx b/editeng/inc/editeng/bulitem.hxx
index 821dabf51f4e..7d64664ea19f 100644
--- a/svx/inc/bulitem.hxx
+++ b/editeng/inc/editeng/bulitem.hxx
@@ -29,7 +29,7 @@
// include ---------------------------------------------------------------
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
// define ----------------------------------------------------------------
@@ -65,11 +65,11 @@
#define VALID_FOLLOWTEXT 0x0100
#include <svl/poolitem.hxx>
#include <vcl/font.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
// class SvxBulletItem ---------------------------------------------------
-class SVX_DLLPUBLIC SvxBulletItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
{
Font aFont;
GraphicObject* pGraphicObject;
diff --git a/svx/inc/charhiddenitem.hxx b/editeng/inc/editeng/charhiddenitem.hxx
index b3212a146aa1..2bffbfa2da5f 100644
--- a/svx/inc/charhiddenitem.hxx
+++ b/editeng/inc/editeng/charhiddenitem.hxx
@@ -31,7 +31,7 @@
#include <svl/poolitem.hxx>
#include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
// class SvxCharHiddenItem -------------------------------------------------
/*
@@ -39,7 +39,7 @@
This item marks text as hidden
*/
-class SVX_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index 3998cdc91895..8fc17c60d7fc 100644
--- a/svx/inc/svx/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -31,10 +31,7 @@
#include <svl/eitem.hxx>
#include <vcl/fntstyle.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxCharRotateItem ----------------------------------------------
@@ -45,7 +42,7 @@
*/
-class SVX_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/charrotateitem.hxx b/editeng/inc/editeng/charrotateitem.hxx
index 4e79c39f1f49..4c5aedb8cdc8 100644
--- a/svx/inc/svx/charrotateitem.hxx
+++ b/editeng/inc/editeng/charrotateitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxCharRotateItem ----------------------------------------------
@@ -46,7 +43,7 @@
*/
-class SVX_DLLPUBLIC SvxCharRotateItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxCharRotateItem : public SfxUInt16Item
{
sal_Bool bFitToLine;
public:
diff --git a/svx/inc/svx/charscaleitem.hxx b/editeng/inc/editeng/charscaleitem.hxx
index cae27de712a4..a6ccb3d3f5e5 100644
--- a/svx/inc/svx/charscaleitem.hxx
+++ b/editeng/inc/editeng/charscaleitem.hxx
@@ -29,13 +29,8 @@
// include ---------------------------------------------------------------
-#ifndef _SFXENUMITEM_HXX
#include <svl/intitem.hxx>
-#endif
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxCharScaleItem ----------------------------------------------
@@ -47,7 +42,7 @@
*/
-class SVX_DLLPUBLIC SvxCharScaleWidthItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxCharScaleWidthItem : public SfxUInt16Item
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
index 6a2da7a3a866..e88792bc4e99 100644
--- a/svx/inc/svx/cmapitem.hxx
+++ b/editeng/inc/editeng/cmapitem.hxx
@@ -30,11 +30,8 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +46,7 @@ namespace rtl
Dieses Item beschreibt die Schrift-Ausrichtung (Versalien, Kapitaelchen,...).
*/
-class SVX_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/cntritem.hxx b/editeng/inc/editeng/cntritem.hxx
index 464e813db6c6..9a5bedaf810a 100644
--- a/svx/inc/svx/cntritem.hxx
+++ b/editeng/inc/editeng/cntritem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxContourItem --------------------------------------------------
@@ -42,7 +39,7 @@
Dieses Item beschreibt, ob Konturschrift eingestellt ist.
*/
-class SVX_DLLPUBLIC SvxContourItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxContourItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/colritem.hxx b/editeng/inc/editeng/colritem.hxx
index f7ffe7a17c66..1eec9e48817d 100644
--- a/svx/inc/svx/colritem.hxx
+++ b/editeng/inc/editeng/colritem.hxx
@@ -30,13 +30,8 @@
// include ---------------------------------------------------------------
#include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#ifndef _SV_COLOR_HXX //autogen
#include <tools/color.hxx>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -53,7 +48,7 @@ namespace rtl
#define VERSION_USEAUTOCOLOR 1
-class SVX_DLLPUBLIC SvxColorItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxColorItem : public SfxPoolItem
{
private:
Color mColor;
diff --git a/svx/inc/svx/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
index 1ce51078e883..d713ae209b6a 100644
--- a/svx/inc/svx/crsditem.hxx
+++ b/editeng/inc/editeng/crsditem.hxx
@@ -31,10 +31,7 @@
#include <vcl/vclenum.hxx>
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +46,7 @@ namespace rtl
Dieses Item beschreibt, ob und wie durchstrichen ist.
*/
-class SVX_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/cscoitem.hxx b/editeng/inc/editeng/cscoitem.hxx
index 70722fd5ae57..f9e990af118a 100644
--- a/svx/inc/svx/cscoitem.hxx
+++ b/editeng/inc/editeng/cscoitem.hxx
@@ -30,8 +30,8 @@
// include ---------------------------------------------------------------
#include <tools/string.hxx>
-#include <svx/colritem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/colritem.hxx>
+#include <editeng/editengdllapi.h>
// class SvxCharSetColorItem ---------------------------------------------
@@ -40,7 +40,7 @@
PB: wird nur intern im Reader des Writers benoetigt
*/
-class SVX_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
+class EDITENG_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
{
rtl_TextEncoding eFrom;
public:
diff --git a/svx/inc/svx/editdata.hxx b/editeng/inc/editeng/editdata.hxx
index 7d7a1a6967cb..f541d64536d8 100644
--- a/svx/inc/svx/editdata.hxx
+++ b/editeng/inc/editeng/editdata.hxx
@@ -30,7 +30,7 @@
#define _MyEDITDATA_HXX
#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
#include <svl/svarray.hxx>
@@ -217,7 +217,7 @@ inline void ESelection::Adjust()
}
}
-struct SVX_DLLPUBLIC EFieldInfo
+struct EDITENG_DLLPUBLIC EFieldInfo
{
SvxFieldItem* pFieldItem;
String aCurrentText;
@@ -304,7 +304,7 @@ struct EECharAttrib
xub_StrLen nEnd;
};
-SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, SVX_DLLPUBLIC )
+SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, EDITENG_DLLPUBLIC )
struct MoveParagraphsInfo
{
diff --git a/svx/inc/svx/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 637b34135d56..3d9afded321f 100644
--- a/svx/inc/svx/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -87,14 +87,14 @@ typedef std::vector<SpellPortion> SpellPortions;
namespace basegfx { class B2DPolyPolygon; }
#include <rsc/rscsfx.hxx>
#ifndef _EDITDATA_HXX
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
#endif
#include <i18npool/lang.h>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
#include <tools/rtti.hxx> // wegen typedef TypeId
-#include <svx/eedata.hxx>
+#include <editeng/eedata.hxx>
class SvxFieldData;
//////////////////////////////////////////////////////////////////////////////
@@ -110,7 +110,7 @@ const sal_uInt8 EditEngineAttribs_OnlyHard = 2; /// returns only attributes
#define GETATTRIBS_CHARATTRIBS (sal_uInt8)0x04
#define GETATTRIBS_ALL (sal_uInt8)0xFF
-class SVX_DLLPUBLIC EditEngine
+class EDITENG_DLLPUBLIC EditEngine
{
friend class EditView;
friend class ImpEditView;
@@ -120,11 +120,11 @@ class SVX_DLLPUBLIC EditEngine
private:
ImpEditEngine* pImpEditEngine;
- SVX_DLLPRIVATE EditEngine( const EditEngine& );
- SVX_DLLPRIVATE EditEngine& operator=( const EditEngine& );
+ EDITENG_DLLPRIVATE EditEngine( const EditEngine& );
+ EDITENG_DLLPRIVATE EditEngine& operator=( const EditEngine& );
//#if 0 // _SOLAR__PRIVATE
- SVX_DLLPRIVATE BOOL PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
+ EDITENG_DLLPRIVATE BOOL PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
//#endif
protected:
@@ -455,6 +455,7 @@ public:
virtual Rectangle GetBulletArea( USHORT nPara );
static SfxItemPool* CreatePool( BOOL bLoadRefCounts = TRUE );
+ static SfxItemPool& GetGlobalItemPool();
static sal_uInt32 RegisterClipboardFormatName();
static BOOL DoesKeyChangeText( const KeyEvent& rKeyEvent );
static BOOL DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
diff --git a/editeng/inc/editeng/editengdllapi.h b/editeng/inc/editeng/editengdllapi.h
new file mode 100644
index 000000000000..ec4b02f07e6a
--- /dev/null
+++ b/editeng/inc/editeng/editengdllapi.h
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: editengdllapi.h,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_EDITENGDLLAPI_H
+#define INCLUDED_EDITENGDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(EDITENG_DLLIMPLEMENTATION)
+#define EDITENG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define EDITENG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define EDITENG_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
diff --git a/editeng/inc/editeng/editerr.hxx b/editeng/inc/editeng/editerr.hxx
new file mode 100644
index 000000000000..ab17123800f7
--- /dev/null
+++ b/editeng/inc/editeng/editerr.hxx
@@ -0,0 +1,39 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svxids.hrc,v $
+ * $Revision: 1.10.132.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDIT_ERR_HRC
+#define _EDIT_ERR_HRC
+
+#include <tools/errcode.hxx>
+
+#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX)
+
+#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT (8UL | ERRCODE_AREA_SVX | \
+ ERRCODE_CLASS_READ )
+#endif
diff --git a/editeng/inc/editeng/editids.hrc b/editeng/inc/editeng/editids.hrc
new file mode 100644
index 000000000000..49629a46c2f9
--- /dev/null
+++ b/editeng/inc/editeng/editids.hrc
@@ -0,0 +1,245 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svxids.hrc,v $
+ * $Revision: 1.10.132.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDIT_SVXIDS_HRC
+#define _EDIT_SVXIDS_HRC
+
+// include ------------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+#define SID_ATTR_BRUSH ( SID_SVX_START + 1 )
+#define SID_ATTR_TABSTOP ( SID_SVX_START + 2 )
+#define SID_ATTR_TABSTOP_DEFAULTS ( SID_SVX_START + 3 )
+#define SID_ATTR_TABSTOP_POS ( SID_SVX_START + 4 )
+#define SID_ATTR_TABSTOP_OFFSET ( SID_SVX_START + 5 )
+#define SID_ATTR_CHAR ( SID_SVX_START + 6 )
+#define SID_ATTR_CHAR_FONT ( SID_SVX_START + 7 )
+#define SID_ATTR_CHAR_POSTURE ( SID_SVX_START + 8 )
+#define SID_ATTR_CHAR_WEIGHT ( SID_SVX_START + 9 )
+#define SID_ATTR_CHAR_SHADOWED ( SID_SVX_START + 10 )
+#define SID_ATTR_CHAR_WORDLINEMODE ( SID_SVX_START + 11 )
+#define SID_ATTR_CHAR_CONTOUR ( SID_SVX_START + 12 )
+#define SID_ATTR_CHAR_STRIKEOUT ( SID_SVX_START + 13 )
+#define SID_ATTR_CHAR_UNDERLINE ( SID_SVX_START + 14 )
+#define SID_ATTR_CHAR_FONTHEIGHT ( SID_SVX_START + 15 )
+#define SID_ATTR_CHAR_PROPSIZE ( SID_SVX_START + 16 )
+#define SID_ATTR_CHAR_COLOR ( SID_SVX_START + 17 )
+#define SID_ATTR_CHAR_KERNING ( SID_SVX_START + 18 )
+#define SID_ATTR_CHAR_CASEMAP ( SID_SVX_START + 19 )
+#define SID_ATTR_CHAR_LANGUAGE ( SID_SVX_START + 20 )
+#define SID_ATTR_CHAR_ESCAPEMENT ( SID_SVX_START + 21 )
+#define SID_ATTR_CHAR_FONTLIST ( SID_SVX_START + 22 )
+#define SID_ATTR_BORDER_OUTER ( SID_SVX_START + 24 )
+#define SID_ATTR_BORDER_SHADOW ( SID_SVX_START + 25 )
+#define SID_ATTR_PARA ( SID_SVX_START + 26 )
+#define SID_ATTR_PARA_ADJUST ( SID_SVX_START + 27 )
+#define SID_ATTR_PARA_ADJUST_LEFT ( SID_SVX_START + 28 )
+#define SID_ATTR_PARA_ADJUST_RIGHT ( SID_SVX_START + 29 )
+#define SID_ATTR_PARA_ADJUST_CENTER ( SID_SVX_START + 30 )
+#define SID_ATTR_PARA_ADJUST_BLOCK ( SID_SVX_START + 31 )
+#define SID_ATTR_PARA_ADJUST_BLOCKLINE ( SID_SVX_START + 32 )
+#define SID_ATTR_PARA_LINESPACE ( SID_SVX_START + 33 )
+#define SID_ATTR_PARA_LINESPACE_10 ( SID_SVX_START + 34 )
+#define SID_ATTR_PARA_LINESPACE_15 ( SID_SVX_START + 35 )
+#define SID_ATTR_PARA_LINESPACE_20 ( SID_SVX_START + 36 )
+#define SID_ATTR_PARA_PAGEBREAK ( SID_SVX_START + 37 )
+#define SID_ATTR_PARA_HYPHENZONE ( SID_SVX_START + 38 )
+#define SID_ATTR_PARA_SPLIT ( SID_SVX_START + 39 )
+#define SID_ATTR_PARA_ORPHANS ( SID_SVX_START + 40 )
+#define SID_ATTR_PARA_WIDOWS ( SID_SVX_START + 41 )
+#define SID_ATTR_PARA_ULSPACE ( SID_SVX_START + 42 )
+#define SID_ATTR_PARA_LRSPACE ( SID_SVX_START + 43 )
+#define SID_ATTR_LRSPACE ( SID_SVX_START + 48 )
+#define SID_ATTR_ULSPACE ( SID_SVX_START + 49 )
+#define SID_ATTR_CHAR_MAPTYPE ( SID_SVX_START + 64 )
+#define SID_ATTR_PARA_MODEL ( SID_SVX_START + 65 )
+#define SID_ATTR_PARA_KEEP ( SID_SVX_START + 66 )
+#define SID_ATTR_CHAR_AUTOKERN ( SID_SVX_START + 67 )
+#define SID_ATTR_PARA_BULLET ( SID_SVX_START + 250 )
+#define SID_ATTR_PARA_OUTLLEVEL ( SID_SVX_START + 300 )
+#define SID_FIELD ( SID_SVX_START + 363 )
+#define SID_ATTR_PARA_REGISTER ( SID_SVX_START + 413 )
+#define SID_ATTR_PARA_PAGENUM ( SID_SVX_START + 457 )
+#define SID_ATTR_PARA_NUMRULE ( SID_SVX_START + 587 )
+#define SID_ATTR_BRUSH_CHAR ( SID_SVX_START + 591 )
+#define SID_ATTR_NUMBERING_RULE ( SID_SVX_START + 855 )
+#define SID_ATTR_CHAR_CHARSETCOLOR ( SID_SVX_START + 877 )
+#define SID_ATTR_CHAR_CJK_FONT ( SID_SVX_START + 887 )
+#define SID_ATTR_CHAR_CJK_FONTHEIGHT ( SID_SVX_START + 888 )
+#define SID_ATTR_CHAR_CJK_LANGUAGE ( SID_SVX_START + 889 )
+#define SID_ATTR_CHAR_CJK_POSTURE ( SID_SVX_START + 890 )
+#define SID_ATTR_CHAR_CJK_WEIGHT ( SID_SVX_START + 891 )
+#define SID_ATTR_CHAR_CTL_FONT ( SID_SVX_START + 892 )
+#define SID_ATTR_CHAR_CTL_FONTHEIGHT ( SID_SVX_START + 893 )
+#define SID_ATTR_CHAR_CTL_LANGUAGE ( SID_SVX_START + 894 )
+#define SID_ATTR_CHAR_CTL_POSTURE ( SID_SVX_START + 895 )
+#define SID_ATTR_CHAR_CTL_WEIGHT ( SID_SVX_START + 896 )
+#define SID_ATTR_CHAR_TWO_LINES ( SID_SVX_START + 897 )
+#define SID_ATTR_CHAR_CJK_RUBY ( SID_SVX_START + 898 )
+#define SID_ATTR_CHAR_EMPHASISMARK ( SID_SVX_START + 899 )
+#define SID_ATTR_CHAR_SCRIPTTYPE ( SID_SVX_START + 900 )
+#define SID_ATTR_PARA_SCRIPTSPACE ( SID_SVX_START + 901 )
+#define SID_ATTR_PARA_HANGPUNCTUATION ( SID_SVX_START + 902 )
+#define SID_ATTR_PARA_FORBIDDEN_RULES ( SID_SVX_START + 903 )
+#define SID_ATTR_CHAR_VERTICAL ( SID_SVX_START + 905 )
+#define SID_ATTR_CHAR_ROTATED ( SID_SVX_START + 910 )
+#define SID_ATTR_CHAR_SCALEWIDTH ( SID_SVX_START + 911 )
+#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ( SID_SVX_START + 919 )
+#define SID_ATTR_CHAR_RELIEF ( SID_SVX_START + 920 )
+#define SID_PARA_VERTALIGN ( SID_SVX_START + 925 )
+#define SID_ATTR_FRAMEDIRECTION ( SID_SVX_START + 944 )
+#define SID_ATTR_PARA_SNAPTOGRID ( SID_SVX_START + 945 )
+#define SID_ATTR_PARA_LRSPACE_VERTICAL ( SID_SVX_START + 947 )
+#define SID_ATTR_PARA_LEFT_TO_RIGHT ( SID_SVX_START + 950 )
+#define SID_ATTR_PARA_RIGHT_TO_LEFT ( SID_SVX_START + 951 )
+#define SID_ATTR_CHAR_HIDDEN ( SID_SVX_START + 989 )
+#define SID_ATTR_CHAR_LATIN_FONT ( SID_SVX_START + 994 )
+#define SID_ATTR_CHAR_LATIN_FONTHEIGHT ( SID_SVX_START + 995 )
+#define SID_ATTR_CHAR_LATIN_LANGUAGE ( SID_SVX_START + 996 )
+#define SID_ATTR_CHAR_LATIN_POSTURE ( SID_SVX_START + 997 )
+#define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_SVX_START + 998 )
+#define SID_ATTR_PARA_OUTLINE_LEVEL ( SID_SVX_START +1092 )
+
+// this ID didn't exist prior to the svx split
+#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 )
+
+/*
+// planned, but not doable: changing value of SIDs will break code that uses them for WhichRanges
+#define SID_PARA_VERTALIGN ( SID_EDIT_START )
+#define SID_ATTR_BORDER_OUTER ( SID_EDIT_START + 1 )
+#define SID_ATTR_BORDER_SHADOW ( SID_EDIT_START + 2 )
+#define SID_ATTR_BRUSH ( SID_EDIT_START + 3 )
+#define SID_ATTR_BRUSH_CHAR ( SID_EDIT_START + 4 )
+
+
+#define SID_FIELD ( SID_EDIT_START + 7 )
+#define SID_ATTR_FRAMEDIRECTION ( SID_EDIT_START + 8 )
+#define SID_ATTR_PARA ( SID_EDIT_START + 9 )
+#define SID_ATTR_PARA_ADJUST ( SID_EDIT_START + 10 )
+#define SID_ATTR_PARA_ADJUST_LEFT ( SID_EDIT_START + 11 )
+#define SID_ATTR_PARA_BULLET ( SID_EDIT_START + 12 )
+#define SID_ATTR_PARA_OUTLLEVEL ( SID_EDIT_START + 13 )
+#define SID_ATTR_PARA_REGISTER ( SID_EDIT_START + 14 )
+#define SID_ATTR_PARA_PAGENUM ( SID_EDIT_START + 15 )
+#define SID_ATTR_PARA_NUMRULE ( SID_EDIT_START + 16 )
+#define SID_ATTR_PARA_SCRIPTSPACE ( SID_EDIT_START + 17 )
+#define SID_ATTR_PARA_HANGPUNCTUATION ( SID_EDIT_START + 18 )
+#define SID_ATTR_PARA_FORBIDDEN_RULES ( SID_EDIT_START + 19 )
+#define SID_ATTR_PARA_SNAPTOGRID ( SID_EDIT_START + 20 )
+#define SID_ATTR_PARA_LRSPACE_VERTICAL ( SID_EDIT_START + 21 )
+#define SID_ATTR_PARA_LEFT_TO_RIGHT ( SID_EDIT_START + 22 )
+#define SID_ATTR_PARA_RIGHT_TO_LEFT ( SID_EDIT_START + 23 )
+#define SID_ATTR_PARA_OUTLINE_LEVEL ( SID_EDIT_START + 24 )
+#define SID_ATTR_PARA_ADJUST_RIGHT ( SID_EDIT_START + 25 )
+#define SID_ATTR_PARA_ADJUST_CENTER ( SID_EDIT_START + 26 )
+#define SID_ATTR_PARA_ADJUST_BLOCK ( SID_EDIT_START + 27 )
+#define SID_ATTR_PARA_ADJUST_BLOCKLINE ( SID_EDIT_START + 28 )
+#define SID_ATTR_PARA_LINESPACE ( SID_EDIT_START + 29 )
+#define SID_ATTR_PARA_LINESPACE_10 ( SID_EDIT_START + 30 )
+#define SID_ATTR_PARA_LINESPACE_15 ( SID_EDIT_START + 31 )
+#define SID_ATTR_PARA_LINESPACE_20 ( SID_EDIT_START + 32 )
+#define SID_ATTR_PARA_PAGEBREAK ( SID_EDIT_START + 33 )
+#define SID_ATTR_PARA_HYPHENZONE ( SID_EDIT_START + 34 )
+#define SID_ATTR_PARA_SPLIT ( SID_EDIT_START + 35 )
+#define SID_ATTR_PARA_ORPHANS ( SID_EDIT_START + 36 )
+#define SID_ATTR_PARA_WIDOWS ( SID_EDIT_START + 37 )
+#define SID_ATTR_PARA_ULSPACE ( SID_EDIT_START + 38 )
+#define SID_ATTR_PARA_LRSPACE ( SID_EDIT_START + 39 )
+#define SID_ATTR_PARA_MODEL ( SID_EDIT_START + 40 )
+#define SID_ATTR_PARA_KEEP ( SID_EDIT_START + 41 )
+#define SID_ATTR_NUMBERING_RULE ( SID_EDIT_START + 42 )
+#define SID_ATTR_LRSPACE ( SID_EDIT_START + 43 )
+#define SID_ATTR_ULSPACE ( SID_EDIT_START + 44 )
+#define SID_ATTR_TABSTOP ( SID_EDIT_START + 45 )
+#define SID_ATTR_TABSTOP_DEFAULTS ( SID_EDIT_START + 46 )
+#define SID_ATTR_TABSTOP_POS ( SID_EDIT_START + 47 )
+#define SID_ATTR_TABSTOP_OFFSET ( SID_EDIT_START + 48 )
+#define SID_ATTR_CHAR ( SID_EDIT_START + 49 )
+#define SID_ATTR_CHAR_FONT ( SID_EDIT_START + 50 )
+#define SID_ATTR_CHAR_POSTURE ( SID_EDIT_START + 51 )
+#define SID_ATTR_CHAR_WEIGHT ( SID_EDIT_START + 52 )
+#define SID_ATTR_CHAR_SHADOWED ( SID_EDIT_START + 53 )
+#define SID_ATTR_CHAR_WORDLINEMODE ( SID_EDIT_START + 54 )
+#define SID_ATTR_CHAR_CONTOUR ( SID_EDIT_START + 55 )
+#define SID_ATTR_CHAR_STRIKEOUT ( SID_EDIT_START + 56 )
+#define SID_ATTR_CHAR_UNDERLINE ( SID_EDIT_START + 57 )
+#define SID_ATTR_CHAR_FONTHEIGHT ( SID_EDIT_START + 58 )
+#define SID_ATTR_CHAR_PROPSIZE ( SID_EDIT_START + 59 )
+#define SID_ATTR_CHAR_COLOR ( SID_EDIT_START + 60 )
+#define SID_ATTR_CHAR_KERNING ( SID_EDIT_START + 61 )
+#define SID_ATTR_CHAR_CASEMAP ( SID_EDIT_START + 62 )
+#define SID_ATTR_CHAR_LANGUAGE ( SID_EDIT_START + 63 )
+#define SID_ATTR_CHAR_ESCAPEMENT ( SID_EDIT_START + 64 )
+#define SID_ATTR_CHAR_FONTLIST ( SID_EDIT_START + 65 )
+#define SID_ATTR_CHAR_MAPTYPE ( SID_EDIT_START + 66 )
+#define SID_ATTR_CHAR_AUTOKERN ( SID_EDIT_START + 67 )
+#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 )
+#define SID_ATTR_CHAR_CHARSETCOLOR ( SID_EDIT_START + 69 )
+#define SID_ATTR_CHAR_CJK_FONT ( SID_EDIT_START + 70 )
+#define SID_ATTR_CHAR_CJK_FONTHEIGHT ( SID_EDIT_START + 71 )
+#define SID_ATTR_CHAR_CJK_LANGUAGE ( SID_EDIT_START + 72 )
+#define SID_ATTR_CHAR_CJK_POSTURE ( SID_EDIT_START + 73 )
+#define SID_ATTR_CHAR_CJK_WEIGHT ( SID_EDIT_START + 74 )
+#define SID_ATTR_CHAR_CTL_FONT ( SID_EDIT_START + 75 )
+#define SID_ATTR_CHAR_CTL_FONTHEIGHT ( SID_EDIT_START + 76 )
+#define SID_ATTR_CHAR_CTL_LANGUAGE ( SID_EDIT_START + 77 )
+#define SID_ATTR_CHAR_CTL_POSTURE ( SID_EDIT_START + 78 )
+#define SID_ATTR_CHAR_CTL_WEIGHT ( SID_EDIT_START + 79 )
+#define SID_ATTR_CHAR_TWO_LINES ( SID_EDIT_START + 80 )
+#define SID_ATTR_CHAR_CJK_RUBY ( SID_EDIT_START + 81 )
+#define SID_ATTR_CHAR_EMPHASISMARK ( SID_EDIT_START + 82 )
+#define SID_ATTR_CHAR_SCRIPTTYPE ( SID_EDIT_START + 83 )
+#define SID_ATTR_CHAR_VERTICAL ( SID_EDIT_START + 84 )
+#define SID_ATTR_CHAR_ROTATED ( SID_EDIT_START + 85 )
+#define SID_ATTR_CHAR_SCALEWIDTH ( SID_EDIT_START + 86 )
+#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ( SID_EDIT_START + 87 )
+#define SID_ATTR_CHAR_RELIEF ( SID_EDIT_START + 88 )
+#define SID_ATTR_CHAR_HIDDEN ( SID_EDIT_START + 89 )
+#define SID_ATTR_CHAR_LATIN_FONT ( SID_EDIT_START + 90 )
+#define SID_ATTR_CHAR_LATIN_FONTHEIGHT ( SID_EDIT_START + 91 )
+#define SID_ATTR_CHAR_LATIN_LANGUAGE ( SID_EDIT_START + 92 )
+#define SID_ATTR_CHAR_LATIN_POSTURE ( SID_EDIT_START + 93 )
+#define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_EDIT_START + 94 )
+*/
+
+#if 94 > (SID_EDIT_END-SID_EDIT_START)
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+#define SID_TEXT_ALIGNLEFT SID_ATTR_PARA_ADJUST_LEFT
+#define SID_TEXT_ALIGNRIGHT SID_ATTR_PARA_ADJUST_RIGHT
+#define SID_TEXT_ALIGNCENTER SID_ATTR_PARA_ADJUST_CENTER
+#define SID_TEXT_ALIGNBLOCK SID_ATTR_PARA_ADJUST_BLOCK
+#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL
+
+#endif
+
+// ******************************************************************* EOF
+
diff --git a/svx/inc/svx/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index 117df3e3f1a1..ef3307fe20c8 100644
--- a/svx/inc/svx/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -32,8 +32,8 @@
#include <tools/debug.hxx>
#include <rsc/rscsfx.hxx>
#include <svl/itemset.hxx>
-#include <svx/eeitem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/eeitem.hxx>
+#include "editeng/editengdllapi.h"
DBG_NAMEEX( EE_EditTextObject )
@@ -45,11 +45,11 @@ class EECharAttribArray;
#define EDTOBJ_SETTINGS_ULITEMSUMMATION 0x00000001
#define EDTOBJ_SETTINGS_ULITEMFIRSTPARA 0x00000002
-class SVX_DLLPUBLIC EditTextObject
+class EDITENG_DLLPUBLIC EditTextObject
{
private:
USHORT nWhich;
- SVX_DLLPRIVATE EditTextObject& operator=( const EditTextObject& );
+ EDITENG_DLLPRIVATE EditTextObject& operator=( const EditTextObject& );
protected:
EditTextObject( USHORT nWhich );
diff --git a/editeng/inc/editeng/editrids.hrc b/editeng/inc/editeng/editrids.hrc
new file mode 100644
index 000000000000..dcef661d01b8
--- /dev/null
+++ b/editeng/inc/editeng/editrids.hrc
@@ -0,0 +1,432 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svxids.hrc,v $
+ * $Revision: 1.10.132.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDIT_RIDS_HRC
+#define _EDIT_RIDS_HRC
+
+// include ------------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+// strings also used in cui
+#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_EDIT_START)
+#define RID_SVXSTR_PAPERBIN (RID_EDIT_START + 1)
+
+#define RID_OUTLUNDO_EXPAND (RID_EDIT_START + 2)
+#define RID_OUTLUNDO_COLLAPSE (RID_EDIT_START + 3)
+#define RID_OUTLUNDO_ATTR (RID_EDIT_START + 4)
+#define RID_OUTLUNDO_INSERT (RID_EDIT_START + 5)
+#define RID_OUTLUNDO_DEPTH (RID_EDIT_START + 6)
+#define RID_OUTLUNDO_HEIGHT (RID_EDIT_START + 7)
+
+// strings for items
+
+#define RID_SVXITEMS_FRMDIR_BEGIN (RID_EDIT_START + 9)
+#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP (RID_EDIT_START + 9)
+#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP (RID_EDIT_START + 10)
+#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT (RID_EDIT_START + 11)
+#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT (RID_EDIT_START + 12)
+#define RID_SVXITEMS_FRMDIR_ENVIRONMENT (RID_EDIT_START + 13)
+#define RID_SVXITEMS_FRMDIR_END (RID_EDIT_START + 14)
+
+#define RID_SVXITEMS_TRUE (RID_EDIT_START + 15)
+#define RID_SVXITEMS_FALSE (RID_EDIT_START + 16)
+#define RID_SVXITEMS_BORDER_COMPLETE (RID_EDIT_START + 17)
+#define RID_SVXITEMS_BORDER_TOP (RID_EDIT_START + 18)
+#define RID_SVXITEMS_BORDER_BOTTOM (RID_EDIT_START + 19)
+#define RID_SVXITEMS_BORDER_LEFT (RID_EDIT_START + 20)
+#define RID_SVXITEMS_BORDER_RIGHT (RID_EDIT_START + 21)
+#define RID_SVXITEMS_BORDER_DISTANCE (RID_EDIT_START + 22)
+#define RID_SVXITEMS_BORDER_NONE (RID_EDIT_START + 23)
+
+#define RID_SVXITEMS_TRANSPARENT_TRUE (RID_EDIT_START + 24)
+#define RID_SVXITEMS_TRANSPARENT_FALSE (RID_EDIT_START + 25)
+#define RID_SVXITEMS_OPAQUE_TRUE (RID_EDIT_START + 26)
+#define RID_SVXITEMS_OPAQUE_FALSE (RID_EDIT_START + 27)
+
+#define RID_SVXITEMS_SHADOW_COMPLETE (RID_EDIT_START + 28)
+#define RID_SVXITEMS_GRAPHIC (RID_EDIT_START + 29)
+#define RID_SVXITEMS_LINES (RID_EDIT_START + 30)
+#define RID_SVXITEMS_ORPHANS_COMPLETE (RID_EDIT_START + 31)
+#define RID_SVXITEMS_WIDOWS_COMPLETE (RID_EDIT_START + 32)
+#define RID_SVXITEMS_PAGEMODEL_COMPLETE (RID_EDIT_START + 33)
+
+#define RID_SVXITEMS_SHADOWED_TRUE (RID_EDIT_START + 34)
+#define RID_SVXITEMS_SHADOWED_FALSE (RID_EDIT_START + 35)
+#define RID_SVXITEMS_AUTOKERN_TRUE (RID_EDIT_START + 36)
+#define RID_SVXITEMS_AUTOKERN_FALSE (RID_EDIT_START + 37)
+#define RID_SVXITEMS_WORDLINE_TRUE (RID_EDIT_START + 38)
+#define RID_SVXITEMS_WORDLINE_FALSE (RID_EDIT_START + 39)
+#define RID_SVXITEMS_CONTOUR_TRUE (RID_EDIT_START + 40)
+#define RID_SVXITEMS_CONTOUR_FALSE (RID_EDIT_START + 41)
+#define RID_SVXITEMS_NOLINEBREAK_TRUE (RID_EDIT_START + 42)
+#define RID_SVXITEMS_NOLINEBREAK_FALSE (RID_EDIT_START + 43)
+#define RID_SVXITEMS_NOHYPHEN_TRUE (RID_EDIT_START + 44)
+#define RID_SVXITEMS_NOHYPHEN_FALSE (RID_EDIT_START + 45)
+#define RID_SVXITEMS_FMTKEEP_TRUE (RID_EDIT_START + 46)
+#define RID_SVXITEMS_FMTKEEP_FALSE (RID_EDIT_START + 47)
+#define RID_SVXITEMS_FMTSPLIT_TRUE (RID_EDIT_START + 48)
+#define RID_SVXITEMS_FMTSPLIT_FALSE (RID_EDIT_START + 49)
+#define RID_SVXITEMS_PRINT_TRUE (RID_EDIT_START + 50)
+#define RID_SVXITEMS_PRINT_FALSE (RID_EDIT_START + 51)
+#define RID_SVXITEMS_PROT_POS_TRUE (RID_EDIT_START + 52)
+#define RID_SVXITEMS_PROT_POS_FALSE (RID_EDIT_START + 53)
+#define RID_SVXITEMS_PROT_SIZE_TRUE (RID_EDIT_START + 54)
+#define RID_SVXITEMS_PROT_SIZE_FALSE (RID_EDIT_START + 55)
+#define RID_SVXITEMS_PROT_CONTENT_TRUE (RID_EDIT_START + 56)
+#define RID_SVXITEMS_PROT_CONTENT_FALSE (RID_EDIT_START + 57)
+#define RID_SVXITEMS_ULSPACE_UPPER (RID_EDIT_START + 58)
+#define RID_SVXITEMS_ULSPACE_LOWER (RID_EDIT_START + 59)
+#define RID_SVXITEMS_LRSPACE_LEFT (RID_EDIT_START + 60)
+#define RID_SVXITEMS_LRSPACE_FLINE (RID_EDIT_START + 62)
+#define RID_SVXITEMS_LRSPACE_RIGHT (RID_EDIT_START + 63)
+#define RID_SVXITEMS_SIZE_WIDTH (RID_EDIT_START + 64)
+#define RID_SVXITEMS_SIZE_HEIGHT (RID_EDIT_START + 65)
+#define RID_SVXITEMS_PAGE_END_TRUE (RID_EDIT_START + 66)
+#define RID_SVXITEMS_PAGE_END_FALSE (RID_EDIT_START + 67)
+#define RID_SVXITEMS_HYPHEN_TRUE (RID_EDIT_START + 68)
+#define RID_SVXITEMS_HYPHEN_FALSE (RID_EDIT_START + 69)
+#define RID_SVXITEMS_HYPHEN_MINLEAD (RID_EDIT_START + 70)
+#define RID_SVXITEMS_HYPHEN_MINTRAIL (RID_EDIT_START + 71)
+#define RID_SVXITEMS_HYPHEN_MAX (RID_EDIT_START + 72)
+#define RID_SVXITEMS_HNGPNCT_OFF (RID_EDIT_START + 73)
+#define RID_SVXITEMS_HNGPNCT_ON (RID_EDIT_START + 74)
+#define RID_SVXITEMS_FORBIDDEN_RULE_OFF (RID_EDIT_START + 75)
+#define RID_SVXITEMS_FORBIDDEN_RULE_ON (RID_EDIT_START + 76)
+#define RID_SVXITEMS_SCRPTSPC_OFF (RID_EDIT_START + 77)
+#define RID_SVXITEMS_SCRPTSPC_ON (RID_EDIT_START + 78)
+#define RID_SVXITEMS_CHARSCALE_OFF (RID_EDIT_START + 79)
+#define RID_SVXITEMS_CHARSCALE (RID_EDIT_START + 80)
+#define RID_SVXITEMS_CHARROTATE_OFF (RID_EDIT_START + 81)
+#define RID_SVXITEMS_CHARROTATE (RID_EDIT_START + 82)
+#define RID_SVXITEMS_CHARROTATE_FITLINE (RID_EDIT_START + 83)
+
+#define RID_SVXITEMS_RELIEF_BEGIN (RID_EDIT_START + 85)
+#define RID_SVXITEMS_RELIEF_NONE (RID_EDIT_START + 85)
+#define RID_SVXITEMS_RELIEF_EMBOSSED (RID_EDIT_START + 86)
+#define RID_SVXITEMS_RELIEF_ENGRAVED (RID_EDIT_START + 87)
+#define RID_SVXITEMS_RELIEF_END (RID_EDIT_START + 88)
+
+// HM_ERR
+#define RID_SVXSTR_HMERR_THESAURUS (RID_EDIT_START + 89)
+
+// enum FontEmphasisMark ---------------------------------------------------
+#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE (RID_EDIT_START + 90)
+#define RID_SVXITEMS_EMPHASIS_NONE_STYLE (RID_EDIT_START + 90)
+#define RID_SVXITEMS_EMPHASIS_DOT_STYLE (RID_EDIT_START + 91)
+#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE (RID_EDIT_START + 92)
+#define RID_SVXITEMS_EMPHASIS_DISC_STYLE (RID_EDIT_START + 93)
+#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE (RID_EDIT_START + 94)
+
+#define RID_SVXITEMS_EMPHASIS_ABOVE_POS (RID_EDIT_START + 95)
+#define RID_SVXITEMS_EMPHASIS_BELOW_POS (RID_EDIT_START + 96)
+
+// enum ESCAPEMENT -------------------------------------------------------
+#define RID_SVXITEMS_ESCAPEMENT_BEGIN (RID_EDIT_START + 97)
+#define RID_SVXITEMS_ESCAPEMENT_OFF (RID_EDIT_START + 97)
+#define RID_SVXITEMS_ESCAPEMENT_SUPER (RID_EDIT_START + 98)
+#define RID_SVXITEMS_ESCAPEMENT_SUB (RID_EDIT_START + 99)
+#define RID_SVXITEMS_ESCAPEMENT_AUTO (RID_EDIT_START + 100)
+
+// enum CASEMAP ----------------------------------------------------------
+#define RID_SVXITEMS_CASEMAP_BEGIN (RID_EDIT_START + 101)
+#define RID_SVXITEMS_CASEMAP_NONE (RID_EDIT_START + 101)
+#define RID_SVXITEMS_CASEMAP_VERSALIEN (RID_EDIT_START + 102)
+#define RID_SVXITEMS_CASEMAP_GEMEINE (RID_EDIT_START + 103)
+#define RID_SVXITEMS_CASEMAP_TITEL (RID_EDIT_START + 104)
+#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN (RID_EDIT_START + 105)
+
+#define RID_SVXITEMS_KERNING_COMPLETE (RID_EDIT_START + 106)
+#define RID_SVXITEMS_KERNING_EXPANDED (RID_EDIT_START + 107)
+#define RID_SVXITEMS_KERNING_CONDENSED (RID_EDIT_START + 108)
+
+#define RID_SVXITEMS_BLINK_TRUE (RID_EDIT_START + 109)
+#define RID_SVXITEMS_BLINK_FALSE (RID_EDIT_START + 110)
+
+#define RID_SVXITEMS_TWOLINES_OFF (RID_EDIT_START + 111)
+#define RID_SVXITEMS_TWOLINES (RID_EDIT_START + 112)
+
+// enum FontStrikeout ----------------------------------------------------
+#define RID_SVXITEMS_STRIKEOUT_BEGIN (RID_EDIT_START + 113)
+#define RID_SVXITEMS_STRIKEOUT_NONE (RID_EDIT_START + 113)
+#define RID_SVXITEMS_STRIKEOUT_SINGLE (RID_EDIT_START + 114)
+#define RID_SVXITEMS_STRIKEOUT_DOUBLE (RID_EDIT_START + 115)
+#define RID_SVXITEMS_STRIKEOUT_DONTKNOW (RID_EDIT_START + 116)
+#define RID_SVXITEMS_STRIKEOUT_BOLD (RID_EDIT_START + 117)
+#define RID_SVXITEMS_STRIKEOUT_SLASH (RID_EDIT_START + 118)
+#define RID_SVXITEMS_STRIKEOUT_X (RID_EDIT_START + 119)
+
+// enum FontUnderline - used for overline --------------------------------
+#define RID_SVXITEMS_OL_BEGIN (RID_EDIT_START + 120)
+#define RID_SVXITEMS_OL_NONE (RID_EDIT_START + 120)
+#define RID_SVXITEMS_OL_SINGLE (RID_EDIT_START + 121)
+#define RID_SVXITEMS_OL_DOUBLE (RID_EDIT_START + 122)
+#define RID_SVXITEMS_OL_DOTTED (RID_EDIT_START + 123)
+#define RID_SVXITEMS_OL_DONTKNOW (RID_EDIT_START + 124)
+#define RID_SVXITEMS_OL_DASH (RID_EDIT_START + 125)
+#define RID_SVXITEMS_OL_LONGDASH (RID_EDIT_START + 126)
+#define RID_SVXITEMS_OL_DASHDOT (RID_EDIT_START + 127)
+#define RID_SVXITEMS_OL_DASHDOTDOT (RID_EDIT_START + 128)
+#define RID_SVXITEMS_OL_SMALLWAVE (RID_EDIT_START + 129)
+#define RID_SVXITEMS_OL_WAVE (RID_EDIT_START + 130)
+#define RID_SVXITEMS_OL_DOUBLEWAVE (RID_EDIT_START + 131)
+#define RID_SVXITEMS_OL_BOLD (RID_EDIT_START + 132)
+#define RID_SVXITEMS_OL_BOLDDOTTED (RID_EDIT_START + 133)
+#define RID_SVXITEMS_OL_BOLDDASH (RID_EDIT_START + 134)
+#define RID_SVXITEMS_OL_BOLDLONGDASH (RID_EDIT_START + 135)
+#define RID_SVXITEMS_OL_BOLDDASHDOT (RID_EDIT_START + 136)
+#define RID_SVXITEMS_OL_BOLDDASHDOTDOT (RID_EDIT_START + 137)
+#define RID_SVXITEMS_OL_BOLDWAVE (RID_EDIT_START + 138)
+
+// enum FontUnderline - used for underline -------------------------------
+#define RID_SVXITEMS_UL_BEGIN (RID_EDIT_START + 139)
+#define RID_SVXITEMS_UL_NONE (RID_EDIT_START + 139)
+#define RID_SVXITEMS_UL_SINGLE (RID_EDIT_START + 140)
+#define RID_SVXITEMS_UL_DOUBLE (RID_EDIT_START + 141)
+#define RID_SVXITEMS_UL_DOTTED (RID_EDIT_START + 142)
+#define RID_SVXITEMS_UL_DONTKNOW (RID_EDIT_START + 143)
+#define RID_SVXITEMS_UL_DASH (RID_EDIT_START + 144)
+#define RID_SVXITEMS_UL_LONGDASH (RID_EDIT_START + 145)
+#define RID_SVXITEMS_UL_DASHDOT (RID_EDIT_START + 146)
+#define RID_SVXITEMS_UL_DASHDOTDOT (RID_EDIT_START + 147)
+#define RID_SVXITEMS_UL_SMALLWAVE (RID_EDIT_START + 148)
+#define RID_SVXITEMS_UL_WAVE (RID_EDIT_START + 149)
+#define RID_SVXITEMS_UL_DOUBLEWAVE (RID_EDIT_START + 150)
+#define RID_SVXITEMS_UL_BOLD (RID_EDIT_START + 151)
+#define RID_SVXITEMS_UL_BOLDDOTTED (RID_EDIT_START + 152)
+#define RID_SVXITEMS_UL_BOLDDASH (RID_EDIT_START + 153)
+#define RID_SVXITEMS_UL_BOLDLONGDASH (RID_EDIT_START + 154)
+#define RID_SVXITEMS_UL_BOLDDASHDOT (RID_EDIT_START + 155)
+#define RID_SVXITEMS_UL_BOLDDASHDOTDOT (RID_EDIT_START + 156)
+#define RID_SVXITEMS_UL_BOLDWAVE (RID_EDIT_START + 157)
+
+// enum FontWeight -------------------------------------------------------
+#define RID_SVXITEMS_WEIGHT_BEGIN (RID_EDIT_START + 158)
+#define RID_SVXITEMS_WEIGHT_DONTKNOW (RID_EDIT_START + 158)
+#define RID_SVXITEMS_WEIGHT_THIN (RID_EDIT_START + 159)
+#define RID_SVXITEMS_WEIGHT_ULTRALIGHT (RID_EDIT_START + 160)
+#define RID_SVXITEMS_WEIGHT_LIGHT (RID_EDIT_START + 161)
+#define RID_SVXITEMS_WEIGHT_SEMILIGHT (RID_EDIT_START + 162)
+#define RID_SVXITEMS_WEIGHT_NORMAL (RID_EDIT_START + 163)
+#define RID_SVXITEMS_WEIGHT_MEDIUM (RID_EDIT_START + 164)
+#define RID_SVXITEMS_WEIGHT_SEMIBOLD (RID_EDIT_START + 165)
+#define RID_SVXITEMS_WEIGHT_BOLD (RID_EDIT_START + 166)
+#define RID_SVXITEMS_WEIGHT_ULTRABOLD (RID_EDIT_START + 167)
+#define RID_SVXITEMS_WEIGHT_BLACK (RID_EDIT_START + 168)
+
+// paper formats
+#define RID_SVXSTR_PAPER_A0 (RID_SVX_START + 169)
+#define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 170)
+#define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 171)
+#define RID_SVXSTR_PAPER_A3 (RID_SVX_START + 172)
+#define RID_SVXSTR_PAPER_A4 (RID_SVX_START + 173)
+#define RID_SVXSTR_PAPER_A5 (RID_SVX_START + 174)
+#define RID_SVXSTR_PAPER_B4_ISO (RID_SVX_START + 175)
+#define RID_SVXSTR_PAPER_B5_ISO (RID_SVX_START + 176)
+#define RID_SVXSTR_PAPER_LETTER (RID_SVX_START + 177)
+#define RID_SVXSTR_PAPER_LEGAL (RID_SVX_START + 178)
+#define RID_SVXSTR_PAPER_TABLOID (RID_SVX_START + 179)
+#define RID_SVXSTR_PAPER_USER (RID_SVX_START + 180)
+#define RID_SVXSTR_PAPER_B6_ISO (RID_SVX_START + 181)
+#define RID_SVXSTR_PAPER_C4 (RID_SVX_START + 182)
+#define RID_SVXSTR_PAPER_C5 (RID_SVX_START + 183)
+#define RID_SVXSTR_PAPER_C6 (RID_SVX_START + 184)
+#define RID_SVXSTR_PAPER_C65 (RID_SVX_START + 185)
+#define RID_SVXSTR_PAPER_DL (RID_SVX_START + 186)
+#define RID_SVXSTR_PAPER_DIA (RID_SVX_START + 187)
+#define RID_SVXSTR_PAPER_SCREEN (RID_SVX_START + 188)
+#define RID_SVXSTR_PAPER_C (RID_SVX_START + 189)
+#define RID_SVXSTR_PAPER_D (RID_SVX_START + 190)
+#define RID_SVXSTR_PAPER_E (RID_SVX_START + 191)
+#define RID_SVXSTR_PAPER_EXECUTIVE (RID_SVX_START + 192)
+#define RID_SVXSTR_PAPER_LEGAL2 (RID_SVX_START + 193)
+#define RID_SVXSTR_PAPER_MONARCH (RID_SVX_START + 194)
+#define RID_SVXSTR_PAPER_COM675 (RID_SVX_START + 195)
+#define RID_SVXSTR_PAPER_COM9 (RID_SVX_START + 196)
+#define RID_SVXSTR_PAPER_COM10 (RID_SVX_START + 197)
+#define RID_SVXSTR_PAPER_COM11 (RID_SVX_START + 198)
+#define RID_SVXSTR_PAPER_COM12 (RID_SVX_START + 199)
+#define RID_SVXSTR_PAPER_KAI16 (RID_SVX_START + 200)
+#define RID_SVXSTR_PAPER_KAI32 (RID_SVX_START + 201)
+#define RID_SVXSTR_PAPER_KAI32BIG (RID_SVX_START + 202)
+#define RID_SVXSTR_PAPER_B4_JIS (RID_SVX_START + 203)
+#define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 204)
+#define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 205)
+
+// enum FontItalic -------------------------------------------------------
+#define RID_SVXITEMS_ITALIC_BEGIN (RID_EDIT_START + 206)
+#define RID_SVXITEMS_ITALIC_NONE (RID_EDIT_START + 206)
+#define RID_SVXITEMS_ITALIC_OBLIQUE (RID_EDIT_START + 207)
+#define RID_SVXITEMS_ITALIC_NORMAL (RID_EDIT_START + 208)
+
+// enum SvxAdjust -----------------------------------------------------------
+#define RID_SVXITEMS_ADJUST_BEGIN (RID_EDIT_START + 209)
+#define RID_SVXITEMS_ADJUST_LEFT (RID_EDIT_START + 209)
+#define RID_SVXITEMS_ADJUST_RIGHT (RID_EDIT_START + 210)
+#define RID_SVXITEMS_ADJUST_BLOCK (RID_EDIT_START + 211)
+#define RID_SVXITEMS_ADJUST_CENTER (RID_EDIT_START + 212)
+#define RID_SVXITEMS_ADJUST_BLOCKLINE (RID_EDIT_START + 213)
+
+#define RID_SVXITEMS_TAB_DECIMAL_CHAR (RID_EDIT_START + 214)
+#define RID_SVXITEMS_TAB_FILL_CHAR (RID_EDIT_START + 215)
+
+#define RID_SVXITEMS_TAB_ADJUST_BEGIN (RID_EDIT_START + 217)
+#define RID_SVXITEMS_TAB_ADJUST_LEFT (RID_EDIT_START + 217)
+#define RID_SVXITEMS_TAB_ADJUST_RIGHT (RID_EDIT_START + 218)
+#define RID_SVXITEMS_TAB_ADJUST_DECIMAL (RID_EDIT_START + 219)
+#define RID_SVXITEMS_TAB_ADJUST_CENTER (RID_EDIT_START + 220)
+#define RID_SVXITEMS_TAB_ADJUST_DEFAULT (RID_EDIT_START + 221)
+
+// enum SvxBreak ------------------------------------------------------------
+#define RID_SVXITEMS_BREAK_BEGIN (RID_EDIT_START + 222)
+#define RID_SVXITEMS_BREAK_NONE (RID_EDIT_START + 222)
+#define RID_SVXITEMS_BREAK_COLUMN_BEFORE (RID_EDIT_START + 223)
+#define RID_SVXITEMS_BREAK_COLUMN_AFTER (RID_EDIT_START + 224)
+#define RID_SVXITEMS_BREAK_COLUMN_BOTH (RID_EDIT_START + 225)
+#define RID_SVXITEMS_BREAK_PAGE_BEFORE (RID_EDIT_START + 226)
+#define RID_SVXITEMS_BREAK_PAGE_AFTER (RID_EDIT_START + 227)
+#define RID_SVXITEMS_BREAK_PAGE_BOTH (RID_EDIT_START + 228)
+
+// enum SvxShadowLocation ---------------------------------------------------
+#define RID_SVXITEMS_SHADOW_BEGIN (RID_EDIT_START + 229)
+#define RID_SVXITEMS_SHADOW_NONE (RID_EDIT_START + 229)
+#define RID_SVXITEMS_SHADOW_TOPLEFT (RID_EDIT_START + 230)
+#define RID_SVXITEMS_SHADOW_TOPRIGHT (RID_EDIT_START + 231)
+#define RID_SVXITEMS_SHADOW_BOTTOMLEFT (RID_EDIT_START + 232)
+#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT (RID_EDIT_START + 233)
+
+// Umrandungslinien
+#define RID_SINGLE_LINE0 (RID_EDIT_START + 234)
+#define RID_SINGLE_LINE1 (RID_EDIT_START + 235)
+#define RID_SINGLE_LINE2 (RID_EDIT_START + 236)
+#define RID_SINGLE_LINE3 (RID_EDIT_START + 237)
+#define RID_SINGLE_LINE4 (RID_EDIT_START + 238)
+#define RID_DOUBLE_LINE0 (RID_EDIT_START + 239)
+#define RID_DOUBLE_LINE1 (RID_EDIT_START + 240)
+#define RID_DOUBLE_LINE2 (RID_EDIT_START + 241)
+#define RID_DOUBLE_LINE3 (RID_EDIT_START + 242)
+#define RID_DOUBLE_LINE4 (RID_EDIT_START + 243)
+#define RID_DOUBLE_LINE5 (RID_EDIT_START + 244)
+#define RID_DOUBLE_LINE6 (RID_EDIT_START + 245)
+#define RID_DOUBLE_LINE7 (RID_EDIT_START + 246)
+#define RID_DOUBLE_LINE8 (RID_EDIT_START + 247)
+#define RID_DOUBLE_LINE9 (RID_EDIT_START + 248)
+#define RID_DOUBLE_LINE10 (RID_EDIT_START + 249)
+
+// Metric-Texte
+#define RID_SVXITEMS_METRIC_MM (RID_EDIT_START + 250)
+#define RID_SVXITEMS_METRIC_CM (RID_EDIT_START + 251)
+#define RID_SVXITEMS_METRIC_INCH (RID_EDIT_START + 252)
+#define RID_SVXITEMS_METRIC_POINT (RID_EDIT_START + 253)
+#define RID_SVXITEMS_METRIC_TWIP (RID_EDIT_START + 254)
+#define RID_SVXITEMS_METRIC_PIXEL (RID_EDIT_START + 255)
+
+// enum ColorName -----------------------------------------------------------
+#define RID_SVXITEMS_COLOR_BEGIN (RID_EDIT_START + 256)
+#define RID_SVXITEMS_COLOR (RID_EDIT_START + 256)
+#define RID_SVXITEMS_COLOR_BLACK (RID_EDIT_START + 257)
+#define RID_SVXITEMS_COLOR_BLUE (RID_EDIT_START + 258)
+#define RID_SVXITEMS_COLOR_GREEN (RID_EDIT_START + 259)
+#define RID_SVXITEMS_COLOR_CYAN (RID_EDIT_START + 260)
+#define RID_SVXITEMS_COLOR_RED (RID_EDIT_START + 261)
+#define RID_SVXITEMS_COLOR_MAGENTA (RID_EDIT_START + 262)
+#define RID_SVXITEMS_COLOR_BROWN (RID_EDIT_START + 263)
+#define RID_SVXITEMS_COLOR_GRAY (RID_EDIT_START + 264)
+#define RID_SVXITEMS_COLOR_LIGHTGRAY (RID_EDIT_START + 265)
+#define RID_SVXITEMS_COLOR_LIGHTBLUE (RID_EDIT_START + 266)
+#define RID_SVXITEMS_COLOR_LIGHTGREEN (RID_EDIT_START + 267)
+#define RID_SVXITEMS_COLOR_LIGHTCYAN (RID_EDIT_START + 268)
+#define RID_SVXITEMS_COLOR_LIGHTRED (RID_EDIT_START + 269)
+#define RID_SVXITEMS_COLOR_LIGHTMAGENTA (RID_EDIT_START + 270)
+#define RID_SVXITEMS_COLOR_YELLOW (RID_EDIT_START + 271)
+#define RID_SVXITEMS_COLOR_WHITE (RID_EDIT_START + 272)
+#define RID_SVXITEMS_COLOR_MENUBAR (RID_EDIT_START + 273)
+#define RID_SVXITEMS_COLOR_MENUBARTEXT (RID_EDIT_START + 274)
+#define RID_SVXITEMS_COLOR_POPUPMENU (RID_EDIT_START + 275)
+#define RID_SVXITEMS_COLOR_POPUPMENUTEXT (RID_EDIT_START + 276)
+#define RID_SVXITEMS_COLOR_WINDOWTEXT (RID_EDIT_START + 277)
+#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE (RID_EDIT_START + 278)
+#define RID_SVXITEMS_COLOR_HIGHLIGHT (RID_EDIT_START + 279)
+#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT (RID_EDIT_START + 280)
+#define RID_SVXITEMS_COLOR_3DTEXT (RID_EDIT_START + 281)
+#define RID_SVXITEMS_COLOR_3DFACE (RID_EDIT_START + 282)
+#define RID_SVXITEMS_COLOR_3DLIGHT (RID_EDIT_START + 283)
+#define RID_SVXITEMS_COLOR_3DSHADOW (RID_EDIT_START + 284)
+#define RID_SVXITEMS_COLOR_SCROLLBAR (RID_EDIT_START + 285)
+#define RID_SVXITEMS_COLOR_FIELD (RID_EDIT_START + 286)
+#define RID_SVXITEMS_COLOR_FIELDTEXT (RID_EDIT_START + 287)
+
+
+#define RID_SVXITEMS_PARASNAPTOGRID_ON (RID_EDIT_START + 288)
+#define RID_SVXITEMS_PARASNAPTOGRID_OFF (RID_EDIT_START + 289)
+
+#define RID_SVXITEMS_PARAVERTALIGN_AUTO (RID_EDIT_START + 290)
+#define RID_SVXITEMS_PARAVERTALIGN_BASELINE (RID_EDIT_START + 291)
+#define RID_SVXITEMS_PARAVERTALIGN_TOP (RID_EDIT_START + 292)
+#define RID_SVXITEMS_PARAVERTALIGN_CENTER (RID_EDIT_START + 293)
+#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM (RID_EDIT_START + 294)
+
+#define RID_SVXITEMS_CHARHIDDEN_FALSE (RID_EDIT_START + 295)
+#define RID_SVXITEMS_CHARHIDDEN_TRUE (RID_EDIT_START + 296)
+
+// strings for error messsages in dictionary updates
+#define RID_SVXSTR_DIC_ERR_UNKNOWN (RID_EDIT_START + 297)
+#define RID_SVXSTR_DIC_ERR_FULL (RID_EDIT_START + 298)
+#define RID_SVXSTR_DIC_ERR_READONLY (RID_EDIT_START + 299)
+
+// ResIds fuer HM-QueryBoxen und Error-Strings
+#define RID_SVXQB_BW_CONTINUE (RID_EDIT_START + 300)
+#define RID_SVXQB_CONTINUE (RID_EDIT_START + 301)
+
+// EditEngine
+#define RID_EDITUNDO_DEL (RID_EDIT_START + 302)
+#define RID_EDITUNDO_MOVE (RID_EDIT_START + 303)
+#define RID_EDITUNDO_INSERT (RID_EDIT_START + 304)
+#define RID_EDITUNDO_REPLACE (RID_EDIT_START + 305)
+#define RID_EDITUNDO_SETATTRIBS (RID_EDIT_START + 306)
+#define RID_EDITUNDO_SETSTYLE (RID_EDIT_START + 307)
+#define RID_EDITUNDO_RESETATTRIBS (RID_EDIT_START + 308)
+#define RID_EDITUNDO_INDENT (RID_EDIT_START + 309)
+#define RID_EDITUNDO_TRANSLITERATE (RID_EDIT_START + 310)
+#define RID_MENU_SPELL (RID_EDIT_START + 311)
+#define RID_STR_PARAGRAPH (RID_EDIT_START + 312)
+#define RID_STR_WORD (RID_EDIT_START + 313)
+#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_EDIT_START + 314)
+#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME (RID_EDIT_START + 315)
+
+#if 315 > (RID_EDIT_END-RID_EDIT_START)
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+
+
+#endif
+
+// ******************************************************************* EOF
+
diff --git a/svx/inc/editstat.hxx b/editeng/inc/editeng/editstat.hxx
index 8db48c63f72c..8db48c63f72c 100644
--- a/svx/inc/editstat.hxx
+++ b/editeng/inc/editeng/editstat.hxx
diff --git a/svx/inc/editund2.hxx b/editeng/inc/editeng/editund2.hxx
index 0efc8c825942..4d037a72c9b9 100644
--- a/svx/inc/editund2.hxx
+++ b/editeng/inc/editeng/editund2.hxx
@@ -28,12 +28,12 @@
#ifndef _EDITUND2_HXX
#define _EDITUND2_HXX
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
#include <svl/undo.hxx>
class ImpEditEngine;
-class SVX_DLLPUBLIC EditUndoManager : public SfxUndoManager
+class EDITENG_DLLPUBLIC EditUndoManager : public SfxUndoManager
{
using SfxUndoManager::Undo;
using SfxUndoManager::Redo;
@@ -50,7 +50,7 @@ public:
// -----------------------------------------------------------------------
// EditUndo
// ------------------------------------------------------------------------
-class SVX_DLLPUBLIC EditUndo : public SfxUndoAction
+class EDITENG_DLLPUBLIC EditUndo : public SfxUndoAction
{
private:
USHORT nId;
diff --git a/svx/inc/svx/editview.hxx b/editeng/inc/editeng/editview.hxx
index 829c2d62be59..ccea5d09321e 100644
--- a/svx/inc/svx/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -57,10 +57,10 @@ class Font;
class FontList;
#ifndef _EDITDATA_HXX
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
#endif
#include <com/sun/star/uno/Reference.h>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
namespace com {
namespace sun {
@@ -69,7 +69,7 @@ namespace datatransfer {
class XTransferable;
}}}}
-class SVX_DLLPUBLIC EditView
+class EDITENG_DLLPUBLIC EditView
{
friend class EditEngine;
friend class ImpEditEngine;
@@ -82,8 +82,8 @@ public: // brauche ich fuer Undo
private:
ImpEditView* pImpEditView;
- SVX_DLLPRIVATE EditView( const EditView& );
- SVX_DLLPRIVATE EditView& operator=( const EditView& );
+ EDITENG_DLLPRIVATE EditView( const EditView& );
+ EDITENG_DLLPRIVATE EditView& operator=( const EditView& );
public:
EditView( EditEngine* pEng, Window* pWindow );
diff --git a/editeng/inc/editeng/edtdlg.hxx b/editeng/inc/editeng/edtdlg.hxx
new file mode 100644
index 000000000000..82f1f07269c4
--- /dev/null
+++ b/editeng/inc/editeng/edtdlg.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: abstdlg.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDT_ABSTDLG_HXX
+#define _EDT_ABSTDLG_HXX
+
+// include ---------------------------------------------------------------
+
+#include <tools/solar.h>
+#include <tools/string.hxx>
+#include <editeng/editengdllapi.h>
+#include <i18npool/lang.h>
+#include <com/sun/star/uno/Reference.hxx>
+#include <vcl/abstdlg.hxx>
+#include <editeng/hangulhanja.hxx>
+
+namespace com { namespace sun { namespace star { namespace linguistic2
+{
+ class XThesaurus;
+ class XHyphenator;
+} } } }
+
+class Window;
+class ResId;
+class Link;
+class SvxSpellWrapper;
+
+class AbstractThesaurusDialog : public VclAbstractDialog
+{
+public:
+ virtual String GetWord() = 0;
+ virtual sal_uInt16 GetLanguage() const = 0;
+ virtual Window* GetWindow() = 0;
+};
+
+class AbstractHyphenWordDialog : public VclAbstractDialog
+{
+public:
+ virtual void SelLeft() = 0;
+ virtual void SelRight() = 0;
+ virtual Window* GetWindow() = 0;
+};
+
+class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog
+{
+ public:
+ virtual void EnableRubySupport( sal_Bool _bVal ) = 0;
+ virtual void SetByCharacter( sal_Bool _bByCharacter ) = 0;
+ virtual void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0;
+ virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) = 0;
+ virtual void SetOptionsChangedHdl( const Link& _rHdl ) = 0;
+ virtual void SetIgnoreHdl( const Link& _rHdl ) = 0;
+ virtual void SetIgnoreAllHdl( const Link& _rHdl ) = 0;
+ virtual void SetChangeHdl( const Link& _rHdl ) = 0;
+ virtual void SetChangeAllHdl( const Link& _rHdl ) = 0;
+ virtual void SetClickByCharacterHdl( const Link& _rHdl ) = 0;
+ virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) = 0;
+ virtual void SetFindHdl( const Link& _rHdl ) = 0;
+ virtual sal_Bool GetUseBothDirections( ) const= 0;
+ virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0;
+ virtual void SetCurrentString(
+ const String& _rNewString,
+ const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions,
+ bool _bOriginatesFromDocument = true )=0;
+ virtual String GetCurrentString( ) const =0;
+ virtual editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const =0;
+ virtual void FocusSuggestion( )= 0;
+ virtual String GetCurrentSuggestion( ) const =0;
+};
+
+class EDITENG_DLLPUBLIC EditAbstractDialogFactory : virtual public VclAbstractDialogFactory
+{
+public:
+ virtual ~EditAbstractDialogFactory(); // needed for export of vtable
+ static EditAbstractDialogFactory* Create();
+ virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus,
+ const String &rWord, sal_Int16 nLanguage ) = 0;
+
+ virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*,
+ const String &rWord, LanguageType nLang,
+ ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen,
+ SvxSpellWrapper* pWrapper ) = 0;
+ virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,
+ editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0;
+};
+
+#endif
+
diff --git a/svx/inc/svx/eedata.hxx b/editeng/inc/editeng/eedata.hxx
index cf8bf69431f2..cf8bf69431f2 100644
--- a/svx/inc/svx/eedata.hxx
+++ b/editeng/inc/editeng/eedata.hxx
diff --git a/svx/inc/svx/eeitem.hxx b/editeng/inc/editeng/eeitem.hxx
index 3b4897fd86ed..3b4897fd86ed 100644
--- a/svx/inc/svx/eeitem.hxx
+++ b/editeng/inc/editeng/eeitem.hxx
diff --git a/svx/inc/svx/eeitemid.hxx b/editeng/inc/editeng/eeitemid.hxx
index 3a7b46a0464d..26f86e5a83b8 100644
--- a/svx/inc/svx/eeitemid.hxx
+++ b/editeng/inc/editeng/eeitemid.hxx
@@ -28,7 +28,7 @@
#ifndef _EEITEMID_HXX
#define _EEITEMID_HXX
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
#ifdef ITEMID_FONT
#undef ITEMID_FONT
diff --git a/svx/inc/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index b00870cc5e3c..417fab6c1e2a 100644
--- a/svx/inc/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -32,8 +32,9 @@ class GlobalEditData;
#include <tools/resid.hxx>
#include <tools/shl.hxx>
+#include <editeng/editengdllapi.h>
-class EditResId: public ResId
+class EDITENG_DLLPUBLIC EditResId: public ResId
{
public:
EditResId( USHORT nId );
@@ -55,4 +56,6 @@ public:
#define EE_DLL() EditDLL::Get()
+#define EE_RESSTR(x) String( EditResId(x) )
+
#endif //_EERDLL_HXX
diff --git a/svx/inc/svx/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx
index 8704234bced9..e461817e4bdb 100644
--- a/svx/inc/svx/emphitem.hxx
+++ b/editeng/inc/editeng/emphitem.hxx
@@ -31,10 +31,7 @@
#include <vcl/vclenum.hxx>
#include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +46,7 @@ namespace rtl
Dieses Item beschreibt die Font-Betonung.
*/
-class SVX_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
index 1fd7ad4e5459..95311632e947 100644
--- a/svx/inc/svx/escpitem.hxx
+++ b/editeng/inc/editeng/escpitem.hxx
@@ -30,11 +30,8 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -55,7 +52,7 @@ namespace rtl
Dieses Item beschreibt die Schrift-Position.
*/
-class SVX_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface
{
short nEsc;
BYTE nProp;
diff --git a/svx/inc/svx/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx
index 135e6ba176c4..573e959cd59e 100644
--- a/svx/inc/svx/fhgtitem.hxx
+++ b/editeng/inc/editeng/fhgtitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -53,7 +50,7 @@ namespace rtl
#define FONTHEIGHT_16_VERSION ((USHORT)0x0001)
#define FONTHEIGHT_UNIT_VERSION ((USHORT)0x0002)
-class SVX_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem
{
UINT32 nHeight;
USHORT nProp; // default 100%
diff --git a/svx/inc/svx/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index 1f1ccef41080..67233ba5337f 100644
--- a/svx/inc/svx/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -32,7 +32,7 @@
#include <tools/date.hxx>
#include <svl/poolitem.hxx>
#include <tools/pstm.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class SvNumberFormatter;
class MetaAction;
@@ -41,7 +41,7 @@ class MetaAction;
-class SVX_DLLPUBLIC SvxFieldData : public SvPersistBase
+class EDITENG_DLLPUBLIC SvxFieldData : public SvPersistBase
{
public:
SV_DECL_PERSIST1( SvxFieldData, SvPersistBase, 1 )
@@ -63,12 +63,12 @@ Das Feld gehoert dem Item.
Das Feld selbst wird durch eine Ableitung von SvxFieldData bestimmt. (RTTI)
*/
-class SVX_DLLPUBLIC SvxFieldItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFieldItem : public SfxPoolItem
{
private:
SvxFieldData* pField;
- SVX_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const USHORT nId );
+ EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const USHORT nId );
public:
TYPEINFO();
@@ -120,7 +120,7 @@ enum SvxDateFormat { SVXDATEFORMAT_APPDEFAULT, // Wie in App eingestellt
SVXDATEFORMAT_F // Dienstag, 13.Februar 1996
};
-class SVX_DLLPUBLIC SvxDateField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxDateField : public SvxFieldData
{
sal_uInt32 nFixDate;
SvxDateType eType;
@@ -163,7 +163,7 @@ enum SvxURLFormat { SVXURLFORMAT_APPDEFAULT, // Wie in App eingestellt
SVXURLFORMAT_REPR // Repraesentation darstellen
};
-class SVX_DLLPUBLIC SvxURLField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxURLField : public SvxFieldData
{
private:
SvxURLFormat eFormat;
@@ -195,7 +195,7 @@ public:
virtual MetaAction* createBeginComment() const;
};
-class SVX_DLLPUBLIC SvxPageField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxPageField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxPageField, SvxFieldData, SVX_PAGEFIELD )
@@ -206,7 +206,7 @@ public:
virtual MetaAction* createBeginComment() const;
};
-class SVX_DLLPUBLIC SvxPagesField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, SVX_PAGESFIELD )
@@ -215,7 +215,7 @@ public:
virtual int operator==( const SvxFieldData& ) const;
};
-class SVX_DLLPUBLIC SvxTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, SVX_TIMEFIELD )
@@ -226,7 +226,7 @@ public:
virtual MetaAction* createBeginComment() const;
};
-class SVX_DLLPUBLIC SvxFileField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxFileField, SvxFieldData, SVX_FILEFIELD )
@@ -235,7 +235,7 @@ public:
virtual int operator==( const SvxFieldData& ) const;
};
-class SVX_DLLPUBLIC SvxTableField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxTableField, SvxFieldData, SVX_TABLEFIELD )
@@ -260,7 +260,7 @@ enum SvxTimeFormat { SVXTIMEFORMAT_APPDEFAULT, // Wie in App eingestellt
SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM
};
-class SVX_DLLPUBLIC SvxExtTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxExtTimeField : public SvxFieldData
{
private:
sal_uInt32 nFixTime;
@@ -307,7 +307,7 @@ enum SvxFileFormat { SVXFILEFORMAT_NAME_EXT, // Dateiname mit Extension
-class SVX_DLLPUBLIC SvxExtFileField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxExtFileField : public SvxFieldData
{
private:
XubString aFile;
@@ -344,7 +344,7 @@ enum SvxAuthorFormat { SVXAUTHORFORMAT_FULLNAME, // vollst„ndiger Name
SVXAUTHORFORMAT_SHORTNAME // Initialen
};
-class SVX_DLLPUBLIC SvxAuthorField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxAuthorField : public SvxFieldData
{
private:
XubString aName;
@@ -386,7 +386,7 @@ public:
/** this field is used as a placeholder for a header&footer in impress. The actual
value is stored at the page */
-class SVX_DLLPUBLIC SvxHeaderField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxHeaderField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, SVX_HEADERFIELD )
@@ -397,7 +397,7 @@ public:
/** this field is used as a placeholder for a header&footer in impress. The actual
value is stored at the page */
-class SVX_DLLPUBLIC SvxFooterField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, SVX_FOOTERFIELD )
@@ -408,7 +408,7 @@ public:
/** this field is used as a placeholder for a header&footer in impress. The actual
value is stored at the page */
-class SVX_DLLPUBLIC SvxDateTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxDateTimeField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, SVX_DATEFIMEFIELD )
diff --git a/svx/inc/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx
index 0494ff2166fa..8c4fd0cd589e 100644
--- a/svx/inc/flstitem.hxx
+++ b/editeng/inc/editeng/flstitem.hxx
@@ -32,7 +32,7 @@
#include <svl/poolitem.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Sequence.h>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
// class SvxFontListItem -------------------------------------------------
@@ -45,7 +45,7 @@ class FontList;
Die Fontliste wird nicht kopiert und nicht geloescht!
*/
-class SVX_DLLPUBLIC SvxFontListItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFontListItem : public SfxPoolItem
{
private:
const FontList* pFontList;
diff --git a/svx/inc/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
index df9f93bc830d..fa6d1e085aab 100644
--- a/svx/inc/fontitem.hxx
+++ b/editeng/inc/editeng/fontitem.hxx
@@ -31,10 +31,8 @@
#include <svl/poolitem.hxx>
#include <tools/string.hxx>
-#ifndef _FONT_HXX //autogen
#include <vcl/font.hxx>
-#endif
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +47,7 @@ namespace rtl
Dieses Item beschreibt einen Font.
*/
-class SVX_DLLPUBLIC SvxFontItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFontItem : public SfxPoolItem
{
String aFamilyName;
String aStyleName;
@@ -112,7 +110,7 @@ public:
};
-SVX_DLLPUBLIC void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian,
+EDITENG_DLLPUBLIC void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian,
SvxFontItem& rComplex );
#endif // #ifndef _SVX_FONTITEM_HXX
diff --git a/svx/inc/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx
index 53b722382db0..3bb83f68ed12 100644
--- a/svx/inc/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -35,7 +35,7 @@
#include <vos/refernce.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
namespace com {
namespace sun {
@@ -52,7 +52,7 @@ struct ForbiddenCharactersInfo
DECLARE_TABLE( SvxForbiddenCharactersTableImpl, ForbiddenCharactersInfo* )
-class SVX_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public vos::OReference
+class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public vos::OReference
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
diff --git a/svx/inc/svx/forbiddenruleitem.hxx b/editeng/inc/editeng/forbiddenruleitem.hxx
index 228027c6549f..e3ca0602b8f9 100644
--- a/svx/inc/svx/forbiddenruleitem.hxx
+++ b/editeng/inc/editeng/forbiddenruleitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxForbiddenRuleItem -----------------------------------------
@@ -42,7 +39,7 @@
This item describe how to handle the last character of a line.
*/
-class SVX_DLLPUBLIC SvxForbiddenRuleItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxForbiddenRuleItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/frmdir.hxx b/editeng/inc/editeng/frmdir.hxx
index bc869a361991..bc869a361991 100644
--- a/svx/inc/svx/frmdir.hxx
+++ b/editeng/inc/editeng/frmdir.hxx
diff --git a/svx/inc/svx/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx
index 656860b0ba46..505f51b7cfab 100644
--- a/svx/inc/svx/frmdiritem.hxx
+++ b/editeng/inc/editeng/frmdiritem.hxx
@@ -30,11 +30,8 @@
// include ---------------------------------------------------------------
#include <svl/intitem.hxx>
-#include <svx/frmdir.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/frmdir.hxx>
+#include <editeng/editengdllapi.h>
// class SvxFrameDirectionItem ----------------------------------------------
@@ -45,7 +42,7 @@
layout text for Western, CJK and CTL languages.
*/
-class SVX_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
{
public:
TYPEINFO();
diff --git a/svx/inc/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx
index 10b3bdc964fa..10b3bdc964fa 100644
--- a/svx/inc/fwdtitem.hxx
+++ b/editeng/inc/editeng/fwdtitem.hxx
diff --git a/svx/inc/svx/hangulhanja.hxx b/editeng/inc/editeng/hangulhanja.hxx
index 92de0ed864bc..a7b52c9a6494 100644
--- a/svx/inc/svx/hangulhanja.hxx
+++ b/editeng/inc/editeng/hangulhanja.hxx
@@ -28,16 +28,14 @@
#define SVX_HANGUL_HANJA_CONVERSION_HXX
#include <vcl/window.hxx>
-#include <svx/svxenum.hxx>
-
#include <memory>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
//.............................................................................
-namespace svx
+namespace editeng
{
//.............................................................................
@@ -59,7 +57,7 @@ namespace svx
single Hangul syllabills when "replace by character" is enabled.
</p>
*/
- class SVX_DLLPUBLIC HangulHanjaConversion
+ class EDITENG_DLLPUBLIC HangulHanjaConversion
{
friend class HangulHanjaConversion_Impl;
diff --git a/svx/inc/svx/hngpnctitem.hxx b/editeng/inc/editeng/hngpnctitem.hxx
index 74a0353bc29b..cecdba9e42f0 100644
--- a/svx/inc/svx/hngpnctitem.hxx
+++ b/editeng/inc/editeng/hngpnctitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxHangingPunctuationItem -----------------------------------------
@@ -42,7 +39,7 @@
This item describe how to handle the last character of a line.
*/
-class SVX_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/hyznitem.hxx b/editeng/inc/editeng/hyznitem.hxx
index bd898a346d16..15acf21825c6 100644
--- a/svx/inc/svx/hyznitem.hxx
+++ b/editeng/inc/editeng/hyznitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +46,7 @@ Dieses Item beschreibt ein Silbentrennungsattribut (Automatisch?, Anzahl der
Zeichen am Zeilenende und -anfang).
*/
-class SVX_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
{
BOOL bHyphen: 1;
BOOL bPageEnd: 1;
diff --git a/svx/inc/svx/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index 2a133b443d5e..d3ffe0ad53a3 100644
--- a/svx/inc/svx/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -29,18 +29,16 @@
// include ---------------------------------------------------------------
-#ifndef _SVXITEMS_HRC
-#include <svx/svxitems.hrc>
-#endif
+#include <editeng/editrids.hrc>
+#include <editeng/eerdll.hxx>
// forward ---------------------------------------------------------------
#include <tools/string.hxx>
#include <tools/resid.hxx>
#include <tools/bigint.hxx>
-#include <svx/dialmgr.hxx>
#include <svl/poolitem.hxx>
#include <tools/shl.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class Color;
class XColorTable;
@@ -50,19 +48,16 @@ class IntlWrapper;
static const sal_Unicode cDelim = ',';
static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
-SVX_DLLPUBLIC String GetSvxString( USHORT nId );
-SVX_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl );
-#ifndef SVX_LIGHT
+EDITENG_DLLPUBLIC String GetSvxString( USHORT nId );
+EDITENG_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl );
String GetColorString( const Color& rCol );
-#endif
-SVX_DLLPUBLIC USHORT GetMetricId( SfxMapUnit eUnit );
+EDITENG_DLLPUBLIC USHORT GetMetricId( SfxMapUnit eUnit );
// -----------------------------------------------------------------------
inline String GetBoolString( BOOL bVal )
{
- return String( ResId( bVal ? RID_SVXITEMS_TRUE
- : RID_SVXITEMS_FALSE, DIALOG_MGR() ) );
+ return String( EditResId( bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE ) );
}
// -----------------------------------------------------------------------
diff --git a/svx/inc/svx/keepitem.hxx b/editeng/inc/editeng/keepitem.hxx
index cdaab8409c88..29c7241f01c3 100644
--- a/svx/inc/svx/keepitem.hxx
+++ b/editeng/inc/editeng/keepitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
namespace rtl
{
@@ -47,7 +44,7 @@ namespace rtl
Dieses Item beschreibt eine logische Variable "Absaetze zusammenhalten?".
*/
-class SVX_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx
index fe6df37b1622..f4d4d67f0361 100644
--- a/svx/inc/svx/kernitem.hxx
+++ b/editeng/inc/editeng/kernitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -51,7 +48,7 @@ namespace rtl
Dieses Item beschreibt die Schrift-Laufweite.
*/
-class SVX_DLLPUBLIC SvxKerningItem : public SfxInt16Item
+class EDITENG_DLLPUBLIC SvxKerningItem : public SfxInt16Item
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/langitem.hxx b/editeng/inc/editeng/langitem.hxx
index f6b1c24835ae..c683b7c6a38c 100644
--- a/svx/inc/svx/langitem.hxx
+++ b/editeng/inc/editeng/langitem.hxx
@@ -31,10 +31,7 @@
#include <svl/eitem.hxx>
#include <i18npool/lang.h>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +46,7 @@ namespace rtl
Dieses Item beschreibt eine Sprache.
*/
-class SVX_DLLPUBLIC SvxLanguageItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxLanguageItem : public SfxEnumItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx
index d34dd9b9d826..74fd91461be7 100644
--- a/svx/inc/svx/lcolitem.hxx
+++ b/editeng/inc/editeng/lcolitem.hxx
@@ -29,16 +29,15 @@
// include ---------------------------------------------------------------
-#include <svx/colritem.hxx>
-#include <svx/svxids.hrc>
-#include "svx/svxdllapi.h"
+#include <editeng/colritem.hxx>
+#include <editeng/editengdllapi.h>
/*
* dummy-Item fuer ToolBox-Controller:
*
*/
-class SVX_DLLPUBLIC SvxLineColorItem : public SvxColorItem
+class EDITENG_DLLPUBLIC SvxLineColorItem : public SvxColorItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx
index 8d8e8daee415..f667c72b1d8b 100644
--- a/svx/inc/svx/lrspitem.hxx
+++ b/editeng/inc/editeng/lrspitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
namespace rtl
{
@@ -66,7 +63,7 @@ SetTxtLeft SetTxtFirst GetLeft GetTxtLeft GetTxtFirst (Was?)
#define LRSPACE_AUTOFIRST_VERSION ((USHORT)0x0003)
#define LRSPACE_NEGATIVE_VERSION ((USHORT)0x0004)
-class SVX_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
{
short nFirstLineOfst; // Erstzeileneinzug _immer_ relativ zu nTxtLeft
long nTxtLeft; // wir spendieren einen USHORT
diff --git a/svx/inc/svx/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
index 388ac037d469..f02676598543 100644
--- a/svx/inc/svx/lspcitem.hxx
+++ b/editeng/inc/editeng/lspcitem.hxx
@@ -30,12 +30,8 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -51,7 +47,7 @@ Dieses Item beschreibt den Abstand zwischen den Zeilen.
*/
#define LINE_SPACE_DEFAULT_HEIGHT 200
-class SVX_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
{
friend SvStream& operator<<( SvStream&, SvxLineSpacingItem& ); //$ ostream
diff --git a/editeng/inc/editeng/measfld.hxx b/editeng/inc/editeng/measfld.hxx
new file mode 100644
index 000000000000..e54e7beb0be4
--- /dev/null
+++ b/editeng/inc/editeng/measfld.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _EDIT_MEASFIELD_HXX
+#define _EDIT_MEASFIELD_HXX
+
+#include <editeng/eeitem.hxx>
+
+#ifndef _FLDITEM_HXX
+#ifndef ITEMID_FIELD
+#ifndef _EDITDATA_HXX
+#include <editeng/editdata.hxx> /* das include wird wg. EE_FEATURE_FIELD benoetigt */
+#endif
+#define ITEMID_FIELD EE_FEATURE_FIELD /* wird fuer #include <editeng/flditem.hxx> benoetigt */
+#endif
+#include <editeng/flditem.hxx>
+#endif
+#include "editeng/editengdllapi.h"
+
+#define SDR_MEASUREFIELD 50
+
+class SdrMeasureObj;
+
+enum SdrMeasureFieldKind {SDRMEASUREFIELD_VALUE,SDRMEASUREFIELD_UNIT,SDRMEASUREFIELD_ROTA90BLANCS};
+
+class EDITENG_DLLPUBLIC SdrMeasureField: public SvxFieldData {
+ SdrMeasureFieldKind eMeasureFieldKind;
+public:
+ SV_DECL_PERSIST1(SdrMeasureField,SvxFieldData,SDR_MEASUREFIELD)
+ SdrMeasureField(): eMeasureFieldKind(SDRMEASUREFIELD_VALUE) {}
+ SdrMeasureField(SdrMeasureFieldKind eNewKind): eMeasureFieldKind(eNewKind) {}
+ virtual ~SdrMeasureField();
+ virtual SvxFieldData* Clone() const;
+ virtual int operator==(const SvxFieldData&) const;
+ SdrMeasureFieldKind GetMeasureFieldKind() const { return eMeasureFieldKind; }
+ void SetMeasureFieldKind(SdrMeasureFieldKind eNewKind) { eMeasureFieldKind=eNewKind; }
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#endif //_SVDFIELD_HXX
+
diff --git a/editeng/inc/editeng/memberids.hrc b/editeng/inc/editeng/memberids.hrc
new file mode 100644
index 000000000000..6bd88ebf164d
--- /dev/null
+++ b/editeng/inc/editeng/memberids.hrc
@@ -0,0 +1,196 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: unomid.hxx,v $
+ * $Revision: 1.3.212.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDT_UNOMID_HXX
+#define _EDT_UNOMID_HXX
+
+#include <svl/memberid.hrc>
+
+#define MID_LOCATION 0x3c
+#define MID_TRANSPARENT 0x4b
+#define MID_BG_COLOR 0x22
+#define MID_FLAGS 0x2e
+#define MID_DISTANCE 0x29
+#define MID_FG_COLOR 0x2c
+#define MID_OUTER_WIDTH 0x41
+#define MID_INNER_WIDTH 0x35
+#define MID_LINESPACE 0x3b
+
+//NameOrIndex
+#define MID_NAME 16
+#define MID_GRAFURL 32
+
+// SvxPageModelItem
+#define MID_AUTO 1
+
+// SvxTabStop
+#define MID_TABSTOPS 0
+#define MID_STD_TAB 1
+
+//SvxHyphenZoneItem
+#define MID_IS_HYPHEN 0
+#define MID_HYPHEN_MIN_LEAD 1
+#define MID_HYPHEN_MIN_TRAIL 2
+#define MID_HYPHEN_MAX_HYPHENS 3
+
+// SvxBoxInfoItem
+#define MID_HORIZONTAL 1
+#define MID_VERTICAL 2
+#define MID_VALIDFLAGS 4
+
+//AdjustItem
+#define MID_PARA_ADJUST 0
+#define MID_LAST_LINE_ADJUST 1
+#define MID_EXPAND_SINGLE 2
+
+//SvxFontItem
+// Don't use 0 as it used for the whole struct
+#define MID_FONT_FAMILY_NAME 1
+#define MID_FONT_STYLE_NAME 2
+#define MID_FONT_FAMILY 3
+#define MID_FONT_CHAR_SET 4
+#define MID_FONT_PITCH 5
+
+// SvxCharReliefItem
+#define MID_RELIEF 0
+
+//SvxCharRotateItem
+#define MID_ROTATE 0
+#define MID_FITTOLINE 1
+
+//SvxExcapementItem
+#define MID_ESC 0
+#define MID_ESC_HEIGHT 1
+#define MID_AUTO_ESC 2
+
+//SvxFontWidthItem
+#define MID_FONTWIDTH 0
+#define MID_FONTWIDTH_PROP 1
+
+//SvxFontHeightItem
+#define MID_FONTHEIGHT 1
+#define MID_FONTHEIGHT_PROP 2
+#define MID_FONTHEIGHT_DIFF 3
+
+//SvxTextLineItem
+#define MID_TEXTLINED 0
+#define MID_TL_STYLE 1
+#define MID_TL_COLOR 2
+#define MID_TL_HASCOLOR 3
+
+//SvxCrossedOutItem
+#define MID_CROSSED_OUT 0
+#define MID_CROSS_OUT 1
+
+//SvxPostureItem
+#define MID_ITALIC 0
+#define MID_POSTURE 1
+
+//SvxBoolItem
+#define MID_BOLD 0
+#define MID_WEIGHT 1
+
+//SvxLanguageItem
+#define MID_LANG_INT 0
+#define MID_LANG_LOCALE 1
+
+//SvxEmphasisMarkItem
+#define MID_EMPHASIS 0
+
+//SvxTwoLinesItem
+#define MID_TWOLINES 0
+#define MID_START_BRACKET 1
+#define MID_END_BRACKET 2
+
+//ULSpaceItem
+#define MID_UL_MARGIN 1
+#define MID_UL_REL_MARGIN 2
+#define MID_UP_MARGIN 3
+#define MID_LO_MARGIN 4
+#define MID_UP_REL_MARGIN 5
+#define MID_LO_REL_MARGIN 6
+
+//LRSpaceItem
+#define MID_LR_MARGIN 0
+#define MID_LRP_MARGIN 1
+#define MID_LR_REL_MARGIN 2
+#define MID_LRP_REL_MARGIN 3
+#define MID_L_MARGIN 4
+#define MID_R_MARGIN 5
+#define MID_L_REL_MARGIN 6
+#define MID_R_REL_MARGIN 7
+#define MID_FIRST_LINE_INDENT 8
+#define MID_FIRST_LINE_REL_INDENT 9
+#define MID_FIRST_AUTO 10
+#define MID_TXT_LMARGIN 11
+
+//ProtectItem
+#define MID_PROTECT_CONTENT 0
+#define MID_PROTECT_SIZE 1
+#define MID_PROTECT_POSITION 2
+
+//SvxBoxItem
+#define LEFT_BORDER 1
+#define RIGHT_BORDER 2
+#define TOP_BORDER 3
+#define BOTTOM_BORDER 4
+#define BORDER_DISTANCE 5
+#define LEFT_BORDER_DISTANCE 6
+#define RIGHT_BORDER_DISTANCE 7
+#define TOP_BORDER_DISTANCE 8
+#define BOTTOM_BORDER_DISTANCE 9
+#define MID_LEFT_BORDER 10
+#define MID_RIGHT_BORDER 11
+#define MID_TOP_BORDER 12
+#define MID_BOTTOM_BORDER 13
+
+//BrushItem
+#define MID_BACK_COLOR 0
+#define MID_GRAPHIC_POSITION 1
+#define MID_GRAPHIC_LINK 2
+#define MID_GRAPHIC 3
+#define MID_GRAPHIC_TRANSPARENT 4
+#define MID_GRAPHIC_URL 5
+#define MID_GRAPHIC_FILTER 6
+#define MID_GRAPHIC_REPEAT 7
+#define MID_GRAPHIC_TRANSPARENCY 8
+#define MID_BACK_COLOR_R_G_B 9
+#define MID_BACK_COLOR_TRANSPARENCY 10
+
+//SvxFmtBreakItem
+#define MID_BREAK_BEFORE 0
+#define MID_BREAK_AFTER 1
+
+//SvxCaseMapItem
+#define MID_CASEMAP_VARIANT 0
+#define MID_CASEMAP_TRANS 1
+
+
+
+#endif
diff --git a/svx/inc/svx/mutxhelp.hxx b/editeng/inc/editeng/mutxhelp.hxx
index 00d7aaa14ec1..00d7aaa14ec1 100644
--- a/svx/inc/svx/mutxhelp.hxx
+++ b/editeng/inc/editeng/mutxhelp.hxx
diff --git a/svx/inc/svx/nhypitem.hxx b/editeng/inc/editeng/nhypitem.hxx
index 56d99253209a..344d5296f3c1 100644
--- a/svx/inc/svx/nhypitem.hxx
+++ b/editeng/inc/editeng/nhypitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxNoHyphenItem -------------------------------------------------
@@ -42,7 +39,7 @@
PB: ???
*/
-class SVX_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/nlbkitem.hxx b/editeng/inc/editeng/nlbkitem.hxx
index e7cd389a24ce..356b9ebc991f 100644
--- a/svx/inc/nlbkitem.hxx
+++ b/editeng/inc/editeng/nlbkitem.hxx
@@ -31,7 +31,7 @@
#include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
// class SvxNoLinebreakItem ----------------------------------------------
@@ -41,7 +41,7 @@
PB: ???
*/
-class SVX_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/numdef.hxx b/editeng/inc/editeng/numdef.hxx
index ae14e93c6ab4..ae14e93c6ab4 100644
--- a/svx/inc/svx/numdef.hxx
+++ b/editeng/inc/editeng/numdef.hxx
diff --git a/svx/inc/svx/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 0ca8cae8e216..101518b227c4 100644
--- a/svx/inc/svx/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -32,20 +32,16 @@
#include <tools/link.hxx>
#include <tools/string.hxx>
#include <svl/poolitem.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#include <tools/gen.hxx>
-#ifndef _SVX_NUMDEF_HXX //autogen
-#include <svx/numdef.hxx>
-#endif
-#ifndef _SV_COLOR_HXX //autogen
+#include <editeng/numdef.hxx>
#include <tools/color.hxx>
-#endif
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/style/NumberingType.hpp>
#include <unotools/fontcvt.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvxBrushItem;
class Font;
@@ -74,7 +70,7 @@ namespace com{namespace sun{ namespace star{
#define SVX_NO_NUMLEVEL 0x20
#define LINK_TOKEN 0x80 //indicate linked bitmaps - for use in dialog only
-class SVX_DLLPUBLIC SvxNumberType
+class EDITENG_DLLPUBLIC SvxNumberType
{
static sal_Int32 nRefCount;
static com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> xFormatter;
@@ -104,7 +100,7 @@ public:
}
};
-class SVX_DLLPUBLIC SvxNumberFormat : public SvxNumberType
+class EDITENG_DLLPUBLIC SvxNumberFormat : public SvxNumberType
{
public:
// --> OD 2008-01-08 #newlistlevelattrs#
@@ -269,7 +265,7 @@ enum SvxNumRuleType
SVX_RULETYPE_END
};
-class SVX_DLLPUBLIC SvxNumRule
+class EDITENG_DLLPUBLIC SvxNumRule
{
USHORT nLevelCount; // Anzahl der unterstuetzten Levels
ULONG nFeatureFlags; // was wird unterstuetzt?
@@ -328,7 +324,7 @@ public:
/* -----------------27.10.98 13:04-------------------
*
* --------------------------------------------------*/
-class SVX_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
{
SvxNumRule* pNumRule;
public:
diff --git a/svx/inc/opaqitem.hxx b/editeng/inc/editeng/opaqitem.hxx
index 3fb3d9fe8dd2..4c71f0cfbb53 100644
--- a/svx/inc/opaqitem.hxx
+++ b/editeng/inc/editeng/opaqitem.hxx
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class SvXMLUnitConverter;
namespace rtl
@@ -46,7 +46,7 @@ namespace rtl
Dieses Item beschreibt eine logische Variable "Undurchsichtig ja oder nein".
*/
-class SVX_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/optitems.hxx b/editeng/inc/editeng/optitems.hxx
index 054affdabcf2..2c6030ebeaf0 100644
--- a/svx/inc/optitems.hxx
+++ b/editeng/inc/editeng/optitems.hxx
@@ -24,20 +24,17 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _SVX_OPTITEMS_HXX
-#define _SVX_OPTITEMS_HXX
+#ifndef _EDITENG_OPTITEMS_HXX
+#define _EDITENG_OPTITEMS_HXX
// include ---------------------------------------------------------------
#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// forward ---------------------------------------------------------------
-namespace com{namespace sun{namespace star{
-namespace beans{
-// class XPropertySet;
-}
+namespace com { namespace sun { namespace star {
namespace linguistic2{
class XSpellChecker1;
}}}}
@@ -45,9 +42,7 @@ namespace linguistic2{
// class SfxSpellCheckItem -----------------------------------------------
-
-
-class SVX_DLLPUBLIC SfxSpellCheckItem: public SfxPoolItem
+class EDITENG_DLLPUBLIC SfxSpellCheckItem: public SfxPoolItem
{
public:
TYPEINFO();
@@ -77,9 +72,7 @@ private:
// class SfxHyphenRegionItem ---------------------------------------------
-
-
-class SVX_DLLPUBLIC SfxHyphenRegionItem: public SfxPoolItem
+class EDITENG_DLLPUBLIC SfxHyphenRegionItem: public SfxPoolItem
{
sal_uInt8 nMinLead;
sal_uInt8 nMinTrail;
@@ -114,7 +107,5 @@ public:
}
};
-
-
#endif
diff --git a/svx/inc/svx/orphitem.hxx b/editeng/inc/editeng/orphitem.hxx
index 3b629915b2d9..32cd8574cf45 100644
--- a/svx/inc/svx/orphitem.hxx
+++ b/editeng/inc/editeng/orphitem.hxx
@@ -30,16 +30,13 @@
// include ---------------------------------------------------------------
#include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
{
class OUString;
}
-#include "svx/svxdllapi.h"
// class SvxOrphansItem --------------------------------------------------
@@ -48,7 +45,7 @@ namespace rtl
Dieses Item beschreibt die Anzahl der Zeilen fuer die Schusterjungenregelung.
*/
-class SVX_DLLPUBLIC SvxOrphansItem: public SfxByteItem
+class EDITENG_DLLPUBLIC SvxOrphansItem: public SfxByteItem
{
friend SvStream & operator<<( SvStream & aS, SvxOrphansItem & );
public:
diff --git a/svx/inc/svx/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index e0e06fa14442..2d7afdb8a68c 100644
--- a/svx/inc/svx/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -33,16 +33,16 @@
#include <svl/brdcst.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
#include <i18npool/lang.h>
#include <tools/color.hxx>
#include <vcl/graph.hxx>
#include <tools/list.hxx>
#include <tools/link.hxx>
#include <rsc/rscsfx.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
#include <tools/rtti.hxx> // wegen typedef TypeId
#include <vector>
@@ -81,9 +81,9 @@ class SvxForbiddenCharactersTable;
#include <com/sun/star/uno/Reference.h>
#include <vos/ref.hxx>
-#include <svx/svxfont.hxx>
-#include <svx/eedata.hxx>
-#include <svx/paragraphdata.hxx>
+#include <editeng/svxfont.hxx>
+#include <editeng/eedata.hxx>
+#include <editeng/paragraphdata.hxx>
class SvxFieldData;
//////////////////////////////////////////////////////////////////////////////
@@ -183,7 +183,7 @@ inline void ParaRange::Adjust()
#define OL_ROOTPARENT (Paragraph*)NULL
-class SVX_DLLPUBLIC OutlinerView
+class EDITENG_DLLPUBLIC OutlinerView
{
friend class Outliner;
@@ -225,28 +225,28 @@ private:
#ifdef _OUTLINER_CXX
- SVX_DLLPRIVATE void ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand );
-
- SVX_DLLPRIVATE ULONG ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
- SVX_DLLPRIVATE void ImpToggleExpand( Paragraph* pParentPara );
- SVX_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds );
- SVX_DLLPRIVATE void ImpHideDDCursor();
- SVX_DLLPRIVATE void ImpShowDDCursor();
- SVX_DLLPRIVATE void ImpPaintDDCursor();
-
- SVX_DLLPRIVATE void ImpDragScroll( const Point& rPosPix );
- SVX_DLLPRIVATE void ImpScrollLeft();
- SVX_DLLPRIVATE void ImpScrollRight();
- SVX_DLLPRIVATE void ImpScrollUp();
- SVX_DLLPRIVATE void ImpScrollDown();
-
- SVX_DLLPRIVATE ULONG ImpGetInsertionPara( const Point& rPosPixel );
- SVX_DLLPRIVATE Point ImpGetDocPos( const Point& rPosPixel );
- SVX_DLLPRIVATE Pointer ImpGetMousePointer( MouseTarget eTarget );
- SVX_DLLPRIVATE USHORT ImpInitPaste( ULONG& rStart );
- SVX_DLLPRIVATE void ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize);
- SVX_DLLPRIVATE USHORT ImpCalcSelectedPages( BOOL bIncludeFirstSelected );
- SVX_DLLPRIVATE BOOL ImpIsIndentingPages();
+ EDITENG_DLLPRIVATE void ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand );
+
+ EDITENG_DLLPRIVATE ULONG ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
+ EDITENG_DLLPRIVATE void ImpToggleExpand( Paragraph* pParentPara );
+ EDITENG_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds );
+ EDITENG_DLLPRIVATE void ImpHideDDCursor();
+ EDITENG_DLLPRIVATE void ImpShowDDCursor();
+ EDITENG_DLLPRIVATE void ImpPaintDDCursor();
+
+ EDITENG_DLLPRIVATE void ImpDragScroll( const Point& rPosPix );
+ EDITENG_DLLPRIVATE void ImpScrollLeft();
+ EDITENG_DLLPRIVATE void ImpScrollRight();
+ EDITENG_DLLPRIVATE void ImpScrollUp();
+ EDITENG_DLLPRIVATE void ImpScrollDown();
+
+ EDITENG_DLLPRIVATE ULONG ImpGetInsertionPara( const Point& rPosPixel );
+ EDITENG_DLLPRIVATE Point ImpGetDocPos( const Point& rPosPixel );
+ EDITENG_DLLPRIVATE Pointer ImpGetMousePointer( MouseTarget eTarget );
+ EDITENG_DLLPRIVATE USHORT ImpInitPaste( ULONG& rStart );
+ EDITENG_DLLPRIVATE void ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize);
+ EDITENG_DLLPRIVATE USHORT ImpCalcSelectedPages( BOOL bIncludeFirstSelected );
+ EDITENG_DLLPRIVATE BOOL ImpIsIndentingPages();
#endif
@@ -395,7 +395,7 @@ DECLARE_LIST(ViewList,OutlinerView*)
//typedef List ViewList;
//#endif
-class SVX_DLLPUBLIC DrawPortionInfo
+class EDITENG_DLLPUBLIC DrawPortionInfo
{
public:
const Point& mrStartPos;
@@ -462,7 +462,7 @@ public:
{}
};
-class SVX_DLLPUBLIC DrawBulletInfo
+class EDITENG_DLLPUBLIC DrawBulletInfo
{
public:
const GraphicObject maBulletGraphicObject;
@@ -479,7 +479,7 @@ public:
{}
};
-struct SVX_DLLPUBLIC PaintFirstLineInfo
+struct EDITENG_DLLPUBLIC PaintFirstLineInfo
{
USHORT mnPara;
const Point& mrStartPos;
@@ -582,7 +582,7 @@ struct EBulletInfo
#define OUTLINERMODE_SUBTITLE (0x0100|OUTLINERMODE_TEXTOBJECT)
#define OUTLINERMODE_NOTE (0x0200|OUTLINERMODE_TEXTOBJECT)
-class SVX_DLLPUBLIC Outliner : public SfxBroadcaster
+class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
{
friend class OutlinerView;
friend class OutlinerEditEng;
diff --git a/svx/inc/svx/outlobj.hxx b/editeng/inc/editeng/outlobj.hxx
index 0a3f4b595ef0..0ce5af3e4c08 100644
--- a/svx/inc/svx/outlobj.hxx
+++ b/editeng/inc/editeng/outlobj.hxx
@@ -33,15 +33,15 @@
#include <tools/solar.h>
#include <tools/string.hxx>
#include <rsc/rscsfx.hxx>
-#include <svx/paragraphdata.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/paragraphdata.hxx>
+#include "editeng/editengdllapi.h"
class EditTextObject;
class ImplOutlinerParaObject;
//////////////////////////////////////////////////////////////////////////////
-class SVX_DLLPUBLIC OutlinerParaObject
+class EDITENG_DLLPUBLIC OutlinerParaObject
{
private:
ImplOutlinerParaObject* mpImplOutlinerParaObject;
diff --git a/svx/inc/svx/paperinf.hxx b/editeng/inc/editeng/paperinf.hxx
index 702239c94244..dbc5c9e01d37 100644
--- a/svx/inc/svx/paperinf.hxx
+++ b/editeng/inc/editeng/paperinf.hxx
@@ -31,8 +31,8 @@
#include <vcl/print.hxx>
#include <vcl/mapmod.hxx>
-#include <svx/svxenum.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include "editeng/editengdllapi.h"
// forward ---------------------------------------------------------------
@@ -42,7 +42,7 @@ class String;
// class SvxPaperInfo -----------------------------------------------------
-class SVX_DLLPUBLIC SvxPaperInfo
+class EDITENG_DLLPUBLIC SvxPaperInfo
{
public:
static Size GetDefaultPaperSize( MapUnit eUnit = MAP_TWIP );
diff --git a/svx/inc/svx/paragraphdata.hxx b/editeng/inc/editeng/paragraphdata.hxx
index 738faa4cb387..738faa4cb387 100644
--- a/svx/inc/svx/paragraphdata.hxx
+++ b/editeng/inc/editeng/paragraphdata.hxx
diff --git a/svx/inc/svx/paravertalignitem.hxx b/editeng/inc/editeng/paravertalignitem.hxx
index 9eb221450840..2def5bc71dbe 100644
--- a/svx/inc/svx/paravertalignitem.hxx
+++ b/editeng/inc/editeng/paravertalignitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxParaVertAlignItem ----------------------------------------------
@@ -44,7 +41,7 @@
*/
-class SVX_DLLPUBLIC SvxParaVertAlignItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxParaVertAlignItem : public SfxUInt16Item
{
public:
enum { AUTOMATIC, BASELINE, TOP, CENTER, BOTTOM };
diff --git a/svx/inc/svx/pbinitem.hxx b/editeng/inc/editeng/pbinitem.hxx
index c92fdf10283c..bc1bd5aa0d59 100644
--- a/svx/inc/svx/pbinitem.hxx
+++ b/editeng/inc/editeng/pbinitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// define ----------------------------------------------------------------
@@ -46,7 +43,7 @@
Dieses Item beschreibt die Auswahl eines Papierschachts des Drucker.
*/
-class SVX_DLLPUBLIC SvxPaperBinItem : public SfxByteItem
+class EDITENG_DLLPUBLIC SvxPaperBinItem : public SfxByteItem
{
public:
TYPEINFO();
diff --git a/svx/inc/pgrditem.hxx b/editeng/inc/editeng/pgrditem.hxx
index 77dd95cc1a3b..c4b81eb69244 100644
--- a/svx/inc/pgrditem.hxx
+++ b/editeng/inc/editeng/pgrditem.hxx
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
// class SvxParaGridItem -------------------------------------------------
@@ -40,7 +40,7 @@
Paragraph snap to grid
*/
-class SVX_DLLPUBLIC SvxParaGridItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxParaGridItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/pmdlitem.hxx b/editeng/inc/editeng/pmdlitem.hxx
index 77ed0155b003..e14b056ed363 100644
--- a/svx/inc/svx/pmdlitem.hxx
+++ b/editeng/inc/editeng/pmdlitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/stritem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxPageModelItem ------------------------------------------------
@@ -42,7 +39,7 @@
Dieses Item enthaelt einen Namen einer Seitenvorlage.
*/
-class SVX_DLLPUBLIC SvxPageModelItem : public SfxStringItem
+class EDITENG_DLLPUBLIC SvxPageModelItem : public SfxStringItem
{
private:
BOOL bAuto;
diff --git a/svx/inc/svx/postitem.hxx b/editeng/inc/editeng/postitem.hxx
index 593591e1c303..9c59aafd8b19 100644
--- a/svx/inc/svx/postitem.hxx
+++ b/editeng/inc/editeng/postitem.hxx
@@ -31,10 +31,7 @@
#include <vcl/vclenum.hxx>
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +46,7 @@ namespace rtl
Dieses Item beschreibt die Font-Stellung (Italic)
*/
-class SVX_DLLPUBLIC SvxPostureItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxPostureItem : public SfxEnumItem
{
public:
TYPEINFO();
diff --git a/svx/inc/prntitem.hxx b/editeng/inc/editeng/prntitem.hxx
index 75083fb0e3b8..53646b520f32 100644
--- a/svx/inc/prntitem.hxx
+++ b/editeng/inc/editeng/prntitem.hxx
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
@@ -43,7 +43,7 @@ Dieses Item beschreibt eine logische Variable "Drucken ja oder nein".
*/
-class SVX_DLLPUBLIC SvxPrintItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxPrintItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/protitem.hxx b/editeng/inc/editeng/protitem.hxx
index 0ccf09d456cd..9ba2976bb367 100644
--- a/svx/inc/protitem.hxx
+++ b/editeng/inc/editeng/protitem.hxx
@@ -31,7 +31,7 @@
#include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class SvXMLUnitConverter;
namespace rtl
@@ -48,7 +48,7 @@ Dieses Item beschreibt, ob Inhalt, Groesse oder Position geschuetzt werden
sollen.
*/
-class SVX_DLLPUBLIC SvxProtectItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxProtectItem : public SfxPoolItem
{
BOOL bCntnt :1; //Inhalt geschuetzt
BOOL bSize :1; //Groesse geschuetzt
diff --git a/svx/inc/svx/prszitem.hxx b/editeng/inc/editeng/prszitem.hxx
index 3affef7ae43e..8a1286c603d8 100644
--- a/svx/inc/svx/prszitem.hxx
+++ b/editeng/inc/editeng/prszitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxPropSizeItem -------------------------------------------------
@@ -42,7 +39,7 @@
Dieses Item beschreibt die relative Schriftgroesse.
*/
-class SVX_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/scriptspaceitem.hxx b/editeng/inc/editeng/scriptspaceitem.hxx
index d8851e085bb5..4896b54c144d 100644
--- a/svx/inc/svx/scriptspaceitem.hxx
+++ b/editeng/inc/editeng/scriptspaceitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxScriptSpaceItem ----------------------------------------------
@@ -43,7 +40,7 @@
used for the user interface.
*/
-class SVX_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/scripttypeitem.hxx b/editeng/inc/editeng/scripttypeitem.hxx
index 82c6d98224c6..de4c3f94b130 100644
--- a/svx/inc/svx/scripttypeitem.hxx
+++ b/editeng/inc/editeng/scripttypeitem.hxx
@@ -30,11 +30,8 @@
// include ---------------------------------------------------------------
#include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
#include <svl/languageoptions.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxScriptTypeItem ----------------------------------------------
@@ -44,11 +41,11 @@
used for the user interface.
*/
-SVX_DLLPUBLIC USHORT GetI18NScriptTypeOfLanguage( USHORT nLang );
+EDITENG_DLLPUBLIC USHORT GetI18NScriptTypeOfLanguage( USHORT nLang );
USHORT GetItemScriptType( short nI18NType );
short GetI18NScriptType( USHORT nItemType );
-class SvxScriptTypeItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxScriptTypeItem : public SfxUInt16Item
{
public:
TYPEINFO();
@@ -58,7 +55,7 @@ public:
};
-class SVX_DLLPUBLIC SvxScriptSetItem : public SfxSetItem
+class EDITENG_DLLPUBLIC SvxScriptSetItem : public SfxSetItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index c9673df4059b..b120df3bca19 100644
--- a/svx/inc/svx/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -31,11 +31,8 @@
#include <tools/color.hxx>
#include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
namespace rtl
{
@@ -54,7 +51,7 @@ namespace rtl
#define SHADOW_LEFT ((USHORT)2)
#define SHADOW_RIGHT ((USHORT)3)
-class SVX_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface
{
Color aShadowColor;
USHORT nWidth;
diff --git a/svx/inc/svx/shdditem.hxx b/editeng/inc/editeng/shdditem.hxx
index c14e1cbb0d39..72c3d3f655d7 100644
--- a/svx/inc/svx/shdditem.hxx
+++ b/editeng/inc/editeng/shdditem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -48,7 +45,7 @@ namespace rtl
Dieses Item beschreibt, ob und wie schattiert ist.
*/
-class SVX_DLLPUBLIC SvxShadowedItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxShadowedItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx
index 94e88765399a..e99eda7a0753 100644
--- a/svx/inc/svx/sizeitem.hxx
+++ b/editeng/inc/editeng/sizeitem.hxx
@@ -31,10 +31,7 @@
#include <tools/gen.hxx>
#include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
// class SvxSizeItem -----------------------------------------------------
@@ -43,7 +40,7 @@
Dieses Item beschreibt eine zweidimensionale Groesse (Size).
*/
-class SVX_DLLPUBLIC SvxSizeItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxSizeItem : public SfxPoolItem
{
Size aSize;
diff --git a/svx/inc/svx/spltitem.hxx b/editeng/inc/editeng/spltitem.hxx
index 74e1aa3161d4..d97959626fc6 100644
--- a/svx/inc/svx/spltitem.hxx
+++ b/editeng/inc/editeng/spltitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -48,7 +45,7 @@ namespace rtl
Dieses Item beschreibt eine logische Variable "Absatz trennen ja oder nein".
*/
-class SVX_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx
index c7af039ad63b..89eb0b53320b 100644
--- a/svx/inc/svx/splwrap.hxx
+++ b/editeng/inc/editeng/splwrap.hxx
@@ -29,10 +29,10 @@
// include ---------------------------------------------------------------
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#include <tools/string.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
// forward ---------------------------------------------------------------
@@ -46,13 +46,13 @@ class Window;
// misc functions ---------------------------------------------------------------
-void SVX_DLLPUBLIC SvxPrepareAutoCorrect( String &rOldText, String &rNewText );
+void EDITENG_DLLPUBLIC SvxPrepareAutoCorrect( String &rOldText, String &rNewText );
/*--------------------------------------------------------------------
Beschreibung: Der SpellWrapper
--------------------------------------------------------------------*/
-class SVX_DLLPUBLIC SvxSpellWrapper {
+class EDITENG_DLLPUBLIC SvxSpellWrapper {
private:
friend class SvxSpellCheckDialog;
friend class SvxHyphenWordDialog;
@@ -77,8 +77,8 @@ private:
sal_Bool bAllRight : 1; // falsche Woerter in geignetes Woerterbuch
// aufnehmen und nicht den Dialog starten.
- SVX_DLLPRIVATE sal_Bool SpellNext(); // naechsten Bereich anwaehlen
- SVX_DLLPRIVATE sal_Bool FindSpellError(); // Suche nach Fehlern ( ueber Bereiche hinweg )
+ EDITENG_DLLPRIVATE sal_Bool SpellNext(); // naechsten Bereich anwaehlen
+ sal_Bool FindSpellError(); // Suche nach Fehlern ( ueber Bereiche hinweg )
public:
SvxSpellWrapper( Window* pWn,
diff --git a/svx/inc/svx/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index f49a75b4de11..c900228cc053 100644
--- a/svx/inc/svx/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -35,8 +35,8 @@
#include <tools/time.hxx>
#include <tools/date.hxx>
#include <tools/string.hxx>
-#include <svx/swafopt.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/swafopt.hxx>
+#include "editeng/editengdllapi.h"
class CharClass;
class SfxPoolItem;
@@ -51,7 +51,7 @@ class SotStorage;
// Flags fuer die AutoKorrekt-Flags
const long CptlSttSntnc = 0x00000001; // Gross-Buchstaben am SatzAnfang
const long CptlSttWrd = 0x00000002; // keine 2 Gr.-Buchst. am WordAnfang
-const long ChgFractionSymbol= 0x00000004; // 1/2, 1/4, .. ersetzen
+const long AddNonBrkSpace = 0x00000004; // Add non breaking space before :;?!
const long ChgOrdinalNumber = 0x00000008; // Ordinal-Number 1st, 2nd,..
const long ChgToEnEmDash = 0x00000010; // - -> Endash/Emdash
const long ChgWeightUnderl = 0x00000020; // * -> Fett, _ -> unterstreichen
@@ -60,7 +60,7 @@ const long Autocorrect = 0x00000080; // Autokorrektur aufrufen
const long ChgQuotes = 0x00000100; // doppelte Quotes ersetzen
const long SaveWordCplSttLst= 0x00000200; // GrB. am SatzAnf. auto. aufnehmen
const long SaveWordWrdSttLst= 0x00000400; // 2 GrB. am WortAnf. auto. aufnehmen
-const long IngnoreDoubleSpace= 0x00000800; // 2 Spaces ignorieren
+const long IgnoreDoubleSpace= 0x00000800; // 2 Spaces ignorieren
const long ChgSglQuotes = 0x00001000; // einfache Quotes ersetzen
const long ChgWordLstLoad = 0x20000000; // Ersetzungsliste geladen
@@ -70,7 +70,7 @@ const long WrdSttLstLoad = 0x80000000; // Exceptionlist fuer WordStart gela
// TODO: handle unicodes > U+FFFF and check users of this class
// nur eine Mappingklasse
-class SVX_DLLPUBLIC SvxAutoCorrDoc
+class EDITENG_DLLPUBLIC SvxAutoCorrDoc
{
public:
SvxAutoCorrDoc() {}
@@ -111,7 +111,7 @@ public:
};
-class SVX_DLLPUBLIC SvxAutocorrWord
+class EDITENG_DLLPUBLIC SvxAutocorrWord
{
String sShort, sLong;
BOOL bIsTxtOnly; // ist reiner ASCII - Text
@@ -126,9 +126,9 @@ public:
};
typedef SvxAutocorrWord* SvxAutocorrWordPtr;
-SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxAutocorrWordList, SvxAutocorrWordPtr, 10, 10 , SVX_DLLPUBLIC)
+SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxAutocorrWordList, SvxAutocorrWordPtr, 10, 10 , EDITENG_DLLPUBLIC)
-class SVX_DLLPUBLIC SvxAutoCorrectLanguageLists
+class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists
{
String sShareAutoCorrFile, sUserAutoCorrFile;
// falls die AutoCorr Datei neuer ist
@@ -196,7 +196,7 @@ public:
};
-class SVX_DLLPUBLIC SvxAutoCorrect
+class EDITENG_DLLPUBLIC SvxAutoCorrect
{
friend class SvxAutoCorrectLanguageLists;
@@ -213,7 +213,6 @@ class SVX_DLLPUBLIC SvxAutoCorrect
long nFlags;
sal_Unicode cStartDQuote, cEndDQuote, cStartSQuote, cEndSQuote,
- c1Div2, c1Div4, c3Div4,
cEmDash, cEnDash;
@@ -356,14 +355,15 @@ public:
BOOL FnCptlSttWrd( SvxAutoCorrDoc&, const String&,
xub_StrLen nSttPos, xub_StrLen nEndPos,
LanguageType eLang = LANGUAGE_SYSTEM );
- BOOL FnChgFractionSymbol( SvxAutoCorrDoc&, const String&,
- xub_StrLen nSttPos, xub_StrLen nEndPos );
BOOL FnChgOrdinalNumber( SvxAutoCorrDoc&, const String&,
xub_StrLen nSttPos, xub_StrLen nEndPos,
LanguageType eLang = LANGUAGE_SYSTEM );
BOOL FnChgToEnEmDash( SvxAutoCorrDoc&, const String&,
xub_StrLen nSttPos, xub_StrLen nEndPos,
LanguageType eLang = LANGUAGE_SYSTEM );
+ BOOL FnAddNonBrkSpace( SvxAutoCorrDoc&, const String&,
+ xub_StrLen nSttPos, xub_StrLen nEndPos,
+ LanguageType eLang = LANGUAGE_SYSTEM );
BOOL FnSetINetAttr( SvxAutoCorrDoc&, const String&,
xub_StrLen nSttPos, xub_StrLen nEndPos,
LanguageType eLang = LANGUAGE_SYSTEM );
@@ -381,6 +381,8 @@ public:
// (used to avoid occasional 'collisions' with (Thai) input-sequence-checking)
static sal_Bool IsAutoCorrectChar( sal_Unicode cChar );
+ sal_Bool NeedsHardspaceAutocorr( sal_Unicode cChar );
+
CharClass& GetCharClass( LanguageType eLang )
{
if( !pCharClass || eLang != eCharClassLang )
diff --git a/svx/inc/svx/svxenum.hxx b/editeng/inc/editeng/svxenum.hxx
index 6222f6ac85a1..6222f6ac85a1 100644
--- a/svx/inc/svx/svxenum.hxx
+++ b/editeng/inc/editeng/svxenum.hxx
diff --git a/svx/inc/svx/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx
index 5a0ac7d73d69..f1e53b31276e 100644
--- a/svx/inc/svx/svxfont.hxx
+++ b/editeng/inc/editeng/svxfont.hxx
@@ -28,16 +28,16 @@
#define _SVX_SVXFONT_HXX
#include <limits.h> // USHRT_MAX
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#include <i18npool/lang.h>
#include <vcl/font.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class SvxDoCapitals;
class OutputDevice;
class Printer;
-class SVX_DLLPUBLIC SvxFont : public Font
+class EDITENG_DLLPUBLIC SvxFont : public Font
{
LanguageType eLang; // Language
SvxCaseMap eCaseMap; // Textauszeichnung
diff --git a/svx/inc/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx
index 897698e2e083..25d20fe0fdcd 100644
--- a/svx/inc/svxrtf.hxx
+++ b/editeng/inc/editeng/svxrtf.hxx
@@ -28,17 +28,14 @@
#ifndef _SVXRTF_HXX
#define _SVXRTF_HXX
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <tools/string.hxx>
#include <svl/itemset.hxx>
#include <svtools/parrtf.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
-#include "svx/svxdllapi.h"
-
+#include <editeng/editengdllapi.h>
class Font;
class Color;
@@ -108,7 +105,7 @@ struct SvxRTFStyleType
// Bitmap - Mode
-struct SVX_DLLPUBLIC SvxRTFPictureType
+struct EDITENG_DLLPUBLIC SvxRTFPictureType
{
// Format der Bitmap
enum RTF_BMPSTYLE
@@ -218,7 +215,7 @@ struct RTFPardAttrMapIds
// -----------------------------------------------------------------------
-class SVX_DLLPUBLIC SvxRTFParser : public SvRTFParser
+class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
{
SvStream &rStrm;
SvxRTFColorTbl aColorTbl;
@@ -407,7 +404,7 @@ public:
// der Stack fuer die Attribute:
// diese Klasse darf nur vom SvxRTFParser benutzt werden!
-class SVX_DLLPUBLIC SvxRTFItemStackType
+class EDITENG_DLLPUBLIC SvxRTFItemStackType
{
friend class SvxRTFParser;
friend class SvxRTFItemStackList;
diff --git a/svx/inc/svx/swafopt.hxx b/editeng/inc/editeng/swafopt.hxx
index 7d5077501c3e..c80711725add 100644
--- a/svx/inc/svx/swafopt.hxx
+++ b/editeng/inc/editeng/swafopt.hxx
@@ -28,13 +28,13 @@
#define _SVXSWAFOPT_HXX
#include <vcl/font.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class SvStringsISortDtor;
class SmartTagMgr;
// Klasse fuer Optionen vom Autoformat
-struct SVX_DLLPUBLIC SvxSwAutoFmtFlags
+struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
{
Font aBulletFont;
Font aByInputBulletFont;
@@ -49,7 +49,6 @@ struct SVX_DLLPUBLIC SvxSwAutoFmtFlags
BYTE nRightMargin;
- BOOL bReplaceQuote : 1;
BOOL bAutoCorrect : 1;
BOOL bCptlSttSntnc : 1;
BOOL bCptlSttWrd : 1;
@@ -62,9 +61,9 @@ struct SVX_DLLPUBLIC SvxSwAutoFmtFlags
BOOL bDelEmptyNode : 1;
BOOL bSetNumRule : 1;
- BOOL bChgFracionSymbol : 1;
BOOL bChgOrdinalNumber : 1;
BOOL bChgToEnEmDash : 1;
+ BOOL bAddNonBrkSpace : 1;
BOOL bChgWeightUnderl : 1;
BOOL bSetINetAttr : 1;
diff --git a/svx/inc/svx/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx
index 91f1462f4c31..887258c20f4f 100644
--- a/svx/inc/svx/tstpitem.hxx
+++ b/editeng/inc/editeng/tstpitem.hxx
@@ -30,11 +30,8 @@
// include ---------------------------------------------------------------
#include <svl/poolitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
// class SvxTabStop ------------------------------------------------------
@@ -44,7 +41,7 @@
#define cDfltDecimalChar (sal_Unicode(0x00)) // aus IntlWrapper besorgen
#define cDfltFillChar (sal_Unicode(' '))
-class SVX_DLLPUBLIC SvxTabStop
+class EDITENG_DLLPUBLIC SvxTabStop
{
private:
long nTabPos;
@@ -53,7 +50,7 @@ private:
mutable sal_Unicode m_cDecimal;
sal_Unicode cFill;
- SVX_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& );
+ EDITENG_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& );
void fillDecimal() const;
@@ -112,14 +109,14 @@ public:
// class SvxTabStopItem --------------------------------------------------
-SV_DECL_VARARR_SORT_VISIBILITY( SvxTabStopArr, SvxTabStop, SVX_TAB_DEFCOUNT, 1, SVX_DLLPUBLIC )
+SV_DECL_VARARR_SORT_VISIBILITY( SvxTabStopArr, SvxTabStop, SVX_TAB_DEFCOUNT, 1, EDITENG_DLLPUBLIC )
/*
[Beschreibung]
Dieses Item beschreibt eine Liste von TabStops.
*/
-class SVX_DLLPUBLIC SvxTabStopItem : public SfxPoolItem, private SvxTabStopArr
+class EDITENG_DLLPUBLIC SvxTabStopItem : public SfxPoolItem, private SvxTabStopArr
{
//friend class SvxTabStopObject_Impl;
diff --git a/svx/inc/svx/twolinesitem.hxx b/editeng/inc/editeng/twolinesitem.hxx
index 82f4b2dee0c5..19ae8c976565 100644
--- a/svx/inc/svx/twolinesitem.hxx
+++ b/editeng/inc/editeng/twolinesitem.hxx
@@ -29,10 +29,7 @@
#include <sal/types.h>
#include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -40,7 +37,7 @@ namespace rtl
class OUString;
}
-class SVX_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
{
sal_Unicode cStartBracket, cEndBracket;
sal_Bool bOn;
diff --git a/svx/inc/txtrange.hxx b/editeng/inc/editeng/txtrange.hxx
index 879f58adc085..5f0c8b721aca 100644
--- a/svx/inc/txtrange.hxx
+++ b/editeng/inc/editeng/txtrange.hxx
@@ -33,7 +33,7 @@
#define _SVSTDARR_LONGS
#include <svl/svstdarr.hxx>
#endif
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class PolyPolygon;
class Range;
@@ -54,7 +54,7 @@ typedef SvLongs* SvLongsPtr;
|* Letzte Aenderung AMA 20.01.97
|*
*************************************************************************/
-class SVX_DLLPUBLIC TextRanger
+class EDITENG_DLLPUBLIC TextRanger
{
Range *pRangeArr;
SvLongsPtr *pCache;
diff --git a/svx/inc/svx/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
index 6b048cab4696..6d4601ab4d20 100644
--- a/svx/inc/svx/udlnitem.hxx
+++ b/editeng/inc/editeng/udlnitem.hxx
@@ -30,12 +30,9 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
#include <vcl/vclenum.hxx>
#include <tools/color.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -47,7 +44,7 @@ namespace rtl
/* Value container for underline and overline font effects */
-class SVX_DLLPUBLIC SvxTextLineItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxTextLineItem : public SfxEnumItem
{
Color mColor;
public:
@@ -103,7 +100,7 @@ public:
/* Value container for underline font effects */
-class SVX_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem
+class EDITENG_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem
{
public:
TYPEINFO();
@@ -120,7 +117,7 @@ public:
/* Value container for overline font effects */
-class SVX_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem
+class EDITENG_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx
index 69c938267648..29774c49ac61 100644
--- a/svx/inc/svx/ulspitem.hxx
+++ b/editeng/inc/editeng/ulspitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
namespace rtl
{
@@ -49,7 +46,7 @@ Dieses Item beschreibt den oberen und unteren Rand einer Seite oder Absatz.
#define ULSPACE_16_VERSION ((USHORT)0x0001)
-class SVX_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem
{
USHORT nUpper; //Oberer Rand
USHORT nLower; //Unterer Rand
diff --git a/svx/inc/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx
index 1ffb74f20d60..6f5dab8afe06 100644
--- a/svx/inc/unoedhlp.hxx
+++ b/editeng/inc/editeng/unoedhlp.hxx
@@ -33,7 +33,7 @@
#include <svtools/textdata.hxx>
#include <svl/hint.hxx>
#include <tools/gen.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
struct EENotify;
class EditEngine;
@@ -46,7 +46,7 @@ class EditEngine;
case denotes the destination position, the two parameters the
start and the end of the moved paragraph range.
*/
-class SVX_DLLPUBLIC SvxEditSourceHint : public TextHint
+class EDITENG_DLLPUBLIC SvxEditSourceHint : public TextHint
{
private:
ULONG mnStart;
@@ -67,7 +67,7 @@ public:
/** Helper class for common functionality in edit sources
*/
-class SVX_DLLPUBLIC SvxEditSourceHelper
+class EDITENG_DLLPUBLIC SvxEditSourceHelper
{
public:
diff --git a/svx/source/inc/unoedprx.hxx b/editeng/inc/editeng/unoedprx.hxx
index 13884401225b..67ff8ce44d7f 100644
--- a/svx/source/inc/unoedprx.hxx
+++ b/editeng/inc/editeng/unoedprx.hxx
@@ -30,10 +30,10 @@
#include <memory>
#include <svl/brdcst.hxx>
-#include <svx/unoedsrc.hxx>
-
-#include <svx/editdata.hxx>
+#include <editeng/unoedsrc.hxx>
+#include <editeng/editdata.hxx>
+#include "editeng/editengdllapi.h"
class SvxAccessibleTextAdapter : public SvxTextForwarder
{
@@ -138,7 +138,7 @@ private:
SvxAccessibleTextAdapter* mrTextForwarder;
};
-class SvxEditSourceAdapter : public SvxEditSource
+class EDITENG_DLLPUBLIC SvxEditSourceAdapter : public SvxEditSource
{
public:
SvxEditSourceAdapter();
diff --git a/svx/inc/svx/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx
index 8bfa15df2096..c9e71da3d84f 100644
--- a/svx/inc/svx/unoedsrc.hxx
+++ b/editeng/inc/editeng/unoedsrc.hxx
@@ -41,7 +41,7 @@
#endif
#include <svl/poolitem.hxx>
#include <svl/itempool.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
#include <list>
@@ -68,7 +68,7 @@ typedef std::list< SvxUnoTextRangeBase* > SvxUnoTextRangeBaseList;
contain an EditEngine/Outliner. Is used e.g. for filling an
EditEngine with the content of a cell, note page or page template.
*/
-class SVX_DLLPUBLIC SvxEditSource
+class EDITENG_DLLPUBLIC SvxEditSource
{
public:
virtual ~SvxEditSource();
@@ -148,7 +148,7 @@ public:
SvxEditSource::UpdateData(). This copies back the data to the model's
EditTextObject/OutlinerParaObject.
*/
-class SVX_DLLPUBLIC SvxTextForwarder
+class EDITENG_DLLPUBLIC SvxTextForwarder
{
public:
virtual ~SvxTextForwarder();
@@ -454,7 +454,7 @@ public:
This one has to be different from the SvxEditViewForwarder, since
the latter is only valid in edit mode.
*/
-class SVX_DLLPUBLIC SvxViewForwarder
+class EDITENG_DLLPUBLIC SvxViewForwarder
{
public:
virtual ~SvxViewForwarder();
diff --git a/svx/inc/unofdesc.hxx b/editeng/inc/editeng/unofdesc.hxx
index dfd9ab726324..3bf7cf2ae04a 100644
--- a/svx/inc/unofdesc.hxx
+++ b/editeng/inc/editeng/unofdesc.hxx
@@ -32,9 +32,9 @@
#include <com/sun/star/beans/PropertyState.hpp>
#include <svl/itemset.hxx>
#include <vcl/font.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
-class SVX_DLLPUBLIC SvxUnoFontDescriptor
+class EDITENG_DLLPUBLIC SvxUnoFontDescriptor
{
public:
static void ConvertToFont( const ::com::sun::star::awt::FontDescriptor& rDesc, Font& rFont );
diff --git a/svx/inc/svx/unofield.hxx b/editeng/inc/editeng/unofield.hxx
index 0e98ad788134..789c5fcecd56 100644
--- a/svx/inc/svx/unofield.hxx
+++ b/editeng/inc/editeng/unofield.hxx
@@ -34,11 +34,11 @@
#include <com/sun/star/text/XTextField.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/component.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
#include <comphelper/servicehelper.hxx>
-#include <svx/mutxhelp.hxx>
+#include <editeng/mutxhelp.hxx>
// ids usable for the constructor
#define ID_DATEFIELD 0
@@ -62,7 +62,10 @@ class SvxUnoFieldData_Impl;
class SfxItemPropertySet;
class SvxFieldData;
-class SVX_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper,
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > EDITENG_DLLPUBLIC SAL_CALL SvxUnoTextCreateTextField(
+ const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+class EDITENG_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper,
public ::cppu::OComponentHelper,
public ::com::sun::star::text::XTextField,
public ::com::sun::star::beans::XPropertySet,
diff --git a/svx/inc/svx/unofored.hxx b/editeng/inc/editeng/unofored.hxx
index b2a21143abe7..fddce62342a6 100644
--- a/svx/inc/svx/unofored.hxx
+++ b/editeng/inc/editeng/unofored.hxx
@@ -28,13 +28,13 @@
#ifndef _SVX_UNOFORED_HXX
#define _SVX_UNOFORED_HXX
-#include <svx/editeng.hxx>
-#include <svx/unoedsrc.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editeng.hxx>
+#include <editeng/unoedsrc.hxx>
+#include "editeng/editengdllapi.h"
// SvxEditEngineForwarder - SvxTextForwarder fuer EditEngine
-class SVX_DLLPUBLIC SvxEditEngineForwarder : public SvxTextForwarder
+class EDITENG_DLLPUBLIC SvxEditEngineForwarder : public SvxTextForwarder
{
private:
EditEngine& rEditEngine;
diff --git a/svx/inc/svx/unoforou.hxx b/editeng/inc/editeng/unoforou.hxx
index 6d9b04f13aa8..0757b2ad20fb 100644
--- a/svx/inc/svx/unoforou.hxx
+++ b/editeng/inc/editeng/unoforou.hxx
@@ -28,21 +28,20 @@
#ifndef _SVX_UNOFOROU_HXX
#define _SVX_UNOFOROU_HXX
-#include <svx/unoedsrc.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/unoedsrc.hxx>
+#include "editeng/editengdllapi.h"
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
class Outliner;
-class SdrObject;
// SvxOutlinerForwarder - SvxTextForwarder fuer Outliner
-class SVX_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder
+class EDITENG_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder
{
private:
Outliner& rOutliner;
- SdrObject* pSdrObject;
+ BOOL bOutlinerText;
/** this pointer may be null or point to an item set for the attribs of
the selection maAttribsSelection */
@@ -59,7 +58,7 @@ private:
mutable USHORT mnParaAttribsCache;
public:
- SvxOutlinerForwarder( Outliner& rOutl, SdrObject* pSdrObj = 0 );
+ SvxOutlinerForwarder( Outliner& rOutl, BOOL bOutlText = FALSE );
virtual ~SvxOutlinerForwarder();
virtual USHORT GetParagraphCount() const;
diff --git a/svx/inc/svx/unoipset.hxx b/editeng/inc/editeng/unoipset.hxx
index 938692725978..3cd3053e4c3e 100644
--- a/svx/inc/svx/unoipset.hxx
+++ b/editeng/inc/editeng/unoipset.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
#include <svl/itemprop.hxx>
class SvxIDPropertyCombineList;
@@ -38,40 +38,46 @@ class SdrItemPool;
class SfxItemSet;
class SvxShape;
-class SVX_DLLPUBLIC SvxItemPropertySet
+#define SFX_METRIC_ITEM (0x40)
+
+class EDITENG_DLLPUBLIC SvxItemPropertySet
{
SfxItemPropertyMap m_aPropertyMap;
mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo;
const SfxItemPropertyMapEntry* _pMap;
SvxIDPropertyCombineList* pCombiList;
sal_Bool mbConvertTwips;
+ SfxItemPool& mrItemPool;
public:
- SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, sal_Bool bConvertTwips = sal_False );
+ SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, SfxItemPool& rPool, sal_Bool bConvertTwips = sal_False );
~SvxItemPropertySet();
// Methoden, die direkt mit dem ItemSet arbeiten
- ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) const;
- void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet ) const;
+ ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) const;
+ void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) const;
// Methoden, die stattdessen Any benutzen
::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const;
void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal ) const;
- // Properties von einem anderen Set uebernehmen
- void ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet, SfxItemSet& rSet, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xSet )const;
sal_Bool AreThereOwnUsrAnys() const { return (pCombiList ? sal_True : sal_False); }
::com::sun::star::uno::Any* GetUsrAnyForID(sal_uInt16 nWID) const;
void AddUsrAnyForID(const ::com::sun::star::uno::Any& rAny, sal_uInt16 nWID);
com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const;
const SfxItemPropertyMapEntry* getPropertyMapEntries() const {return _pMap;}
- //void setPropertyMap( const SfxItemPropertyMapEntry *pMap ) { _pMap = pMap; }
const SfxItemPropertyMap* getPropertyMap()const { return &m_aPropertyMap;}
const SfxItemPropertySimpleEntry* getPropertyMapEntry(const ::rtl::OUString &rName) const;
static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > getPropertySetInfo( const SfxItemPropertyMapEntry* pMap );
};
+/** converts the given any with a metric to 100th/mm if needed */
+EDITENG_DLLPUBLIC void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, com::sun::star::uno::Any & rMetric ) throw();
+
+/** converts the given any with a metric from 100th/mm to the given metric if needed */
+EDITENG_DLLPUBLIC void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, com::sun::star::uno::Any & rMetric ) throw();
+
#endif // _SVX_UNOIPSET_HXX_
diff --git a/svx/inc/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx
index 09731b58ba32..7ca3a2be0fce 100644
--- a/svx/inc/unolingu.hxx
+++ b/editeng/inc/editeng/unolingu.hxx
@@ -39,7 +39,7 @@
#include <com/sun/star/linguistic2/XThesaurus.hpp>
#include <com/sun/star/linguistic2/XDictionaryList.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class LinguMgrExitLstnr;
@@ -64,13 +64,13 @@ class SvxLinguConfigUpdate
public:
- SVX_DLLPUBLIC static void UpdateAll( sal_Bool bForceCheck = sal_False );
+ EDITENG_DLLPUBLIC static void UpdateAll( sal_Bool bForceCheck = sal_False );
static BOOL IsNeedUpdateAll( sal_Bool bForceCheck = sal_False );
};
///////////////////////////////////////////////////////////////////////////
-class SVX_DLLPUBLIC LinguMgr
+class EDITENG_DLLPUBLIC LinguMgr
{
friend class LinguMgrExitLstnr;
@@ -170,22 +170,22 @@ inline SvxAlternativeSpelling::SvxAlternativeSpelling() :
}
-SVX_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling(
+EDITENG_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling(
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord > & rHyphWord );
///////////////////////////////////////////////////////////////////////////
-class SVX_DLLPUBLIC SvxDicListChgClamp
+class EDITENG_DLLPUBLIC SvxDicListChgClamp
{
private:
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryList > xDicList;
// disallow access to copy-constructor and assignment-operator
- SVX_DLLPRIVATE SvxDicListChgClamp(const SvxDicListChgClamp &);
- SVX_DLLPRIVATE SvxDicListChgClamp & operator = (const SvxDicListChgClamp &);
+ EDITENG_DLLPRIVATE SvxDicListChgClamp(const SvxDicListChgClamp &);
+ EDITENG_DLLPRIVATE SvxDicListChgClamp & operator = (const SvxDicListChgClamp &);
public:
SvxDicListChgClamp( ::com::sun::star::uno::Reference<
@@ -196,38 +196,38 @@ public:
///////////////////////////////////////////////////////////////////////////
//TL:TODO: remove those functions or make them inline
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > SvxGetSpellChecker();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator > SvxGetHyphenator();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XThesaurus > SvxGetThesaurus();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryList > SvxGetDictionaryList();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > SvxGetLinguPropertySet();
//TL:TODO: remove argument or provide SvxGetIgnoreAllList with the same one
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionary > SvxGetOrCreatePosDic(
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryList > xDicList );
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionary > SvxGetIgnoreAllList();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionary > SvxGetChangeAllList();
///////////////////////////////////////////////////////////////////////////
// misc functions
//
-SVX_DLLPUBLIC LanguageType SvxLocaleToLanguage(
+EDITENG_DLLPUBLIC LanguageType SvxLocaleToLanguage(
const ::com::sun::star::lang::Locale& rLocale );
-SVX_DLLPUBLIC ::com::sun::star::lang::Locale& SvxLanguageToLocale(
+EDITENG_DLLPUBLIC ::com::sun::star::lang::Locale& SvxLanguageToLocale(
::com::sun::star::lang::Locale& rLocale, LanguageType eLang );
-SVX_DLLPUBLIC ::com::sun::star::lang::Locale SvxCreateLocale( LanguageType eLang );
+EDITENG_DLLPUBLIC ::com::sun::star::lang::Locale SvxCreateLocale( LanguageType eLang );
-SVX_DLLPUBLIC short SvxDicError( Window *pParent, sal_Int16 nError );
+EDITENG_DLLPUBLIC short SvxDicError( Window *pParent, sal_Int16 nError );
#endif
diff --git a/editeng/inc/editeng/unonrule.hxx b/editeng/inc/editeng/unonrule.hxx
new file mode 100644
index 000000000000..c308dc2e52ba
--- /dev/null
+++ b/editeng/inc/editeng/unonrule.hxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SVX_UNONRULE_HXX
+#define _SVX_UNONRULE_HXX
+
+#include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/ucb/XAnyCompare.hpp>
+#include "editeng/editengdllapi.h"
+#include <cppuhelper/implbase5.hxx>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/util/XCloneable.hpp>
+#include <editeng/numitem.hxx>
+#include <comphelper/servicehelper.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
+
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw();
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule() throw();
+const SvxNumRule& SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule ) throw( ::com::sun::star::lang::IllegalArgumentException );
+bool SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule, SvxNumRule& rNumRule );
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw();
+
+class SvxUnoNumberingRules : public ::cppu::WeakAggImplHelper5< com::sun::star::container::XIndexReplace, com::sun::star::ucb::XAnyCompare,
+ com::sun::star::lang::XUnoTunnel, com::sun::star::util::XCloneable, com::sun::star::lang::XServiceInfo >
+{
+private:
+ SvxNumRule maRule;
+public:
+ SvxUnoNumberingRules( const SvxNumRule& rRule ) throw();
+ virtual ~SvxUnoNumberingRules() throw();
+
+ UNO3_GETIMPLEMENTATION_DECL( SvxUnoNumberingRules )
+
+ //XIndexReplace
+ virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const com::sun::star::uno::Any& Element ) throw(
+ com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IndexOutOfBoundsException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+
+ //XIndexAccess
+ virtual sal_Int32 SAL_CALL getCount() throw(com::sun::star::uno::RuntimeException) ;
+ virtual com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(com::sun::star::lang::IndexOutOfBoundsException,
+ com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+
+ //XElementAccess
+ virtual com::sun::star::uno::Type SAL_CALL getElementType() throw(com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hasElements() throw(com::sun::star::uno::RuntimeException);
+
+ // XAnyCompare
+ virtual sal_Int16 SAL_CALL compare( const com::sun::star::uno::Any& Any1, const com::sun::star::uno::Any& Any2 ) throw(com::sun::star::uno::RuntimeException);
+
+ // XCloneable
+ virtual com::sun::star::uno::Reference< com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (com::sun::star::uno::RuntimeException);
+
+ // XServiceInfo
+ virtual rtl::OUString SAL_CALL getImplementationName( ) throw(com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(com::sun::star::uno::RuntimeException);
+
+ // intern
+ com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getNumberingRuleByIndex( sal_Int32 nIndex) const throw();
+ void setNumberingRuleByIndex( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rProperties, sal_Int32 nIndex) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException );
+
+ static sal_Int16 Compare( const com::sun::star::uno::Any& rAny1, const com::sun::star::uno::Any& rAny2 );
+
+ const SvxNumRule& getNumRule() const { return maRule; }
+};
+
+
+#endif
+
+
diff --git a/svx/source/inc/unopracc.hxx b/editeng/inc/editeng/unopracc.hxx
index 5572d5adeb2e..60cab861c95d 100644
--- a/svx/source/inc/unopracc.hxx
+++ b/editeng/inc/editeng/unopracc.hxx
@@ -28,8 +28,7 @@
#ifndef _SVX_UNOPRACC_HXX
#define _SVX_UNOPRACC_HXX
-#include <svx/unoshape.hxx>
-#include <svx/unotext.hxx>
+#include <editeng/unotext.hxx>
class SvxEditSource;
diff --git a/svx/inc/svx/unoprnms.hxx b/editeng/inc/editeng/unoprnms.hxx
index 8d8619479dbc..8d8619479dbc 100644
--- a/svx/inc/svx/unoprnms.hxx
+++ b/editeng/inc/editeng/unoprnms.hxx
diff --git a/svx/inc/svx/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index db25db552977..78de836ba0ee 100644
--- a/svx/inc/svx/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -28,16 +28,15 @@
#ifndef _SVX_UNOTEXT_HXX
#define _SVX_UNOTEXT_HXX
-#include <tools/link.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/text/XText.hpp>
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS
#include <com/sun/star/container/XEnumerationAccess.hpp>
-#endif
#include <com/sun/star/text/XTextRangeMover.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -45,19 +44,6 @@
#include <com/sun/star/beans/XMultiPropertyStates.hpp>
#include <com/sun/star/text/XTextAppend.hpp>
#include <com/sun/star/text/XTextCopy.hpp>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <svl/itemprop.hxx>
-#include <svx/editdata.hxx>
-#include <svx/unoedsrc.hxx>
-#include <svl/itemset.hxx>
-#include <svl/itempool.hxx>
-#include <svx/svxenum.hxx>
-#include <svx/outliner.hxx>
-#include <svx/unoforou.hxx>
-
-#include <svx/unoprnms.hxx>
-#include <svx/eeitem.hxx>
#include <com/sun/star/text/XTextField.hpp>
#include <com/sun/star/container/XIndexReplace.hpp>
#include <com/sun/star/awt/FontSlant.hpp>
@@ -67,10 +53,22 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <cppuhelper/interfacecontainer.h>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/weakagg.hxx>
#include <osl/mutex.hxx>
-#include "svx/svxdllapi.h"
-
#include <comphelper/servicehelper.hxx>
+#include <tools/link.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/solar.hrc>
+#include <editeng/editdata.hxx>
+#include <editeng/unoedsrc.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editengdllapi.h>
+#include <editeng/memberids.hrc>
+
+class SvxItemPropertySet;
#ifndef SEQTYPE
#if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)
@@ -80,14 +78,11 @@
#endif
#endif
-#include <svx/unoprov.hxx>
-#include <svx/unomid.hxx>
-
-#define WID_FONTDESC 3900
-#define WID_NUMLEVEL 3901
-#define WID_PORTIONTYPE 3903
-#define WID_NUMBERINGSTARTVALUE 3904
-#define WID_PARAISNUMBERINGRESTART 3905
+#define WID_FONTDESC OWN_ATTR_VALUE_START
+#define WID_NUMLEVEL OWN_ATTR_VALUE_START+1
+#define WID_PORTIONTYPE OWN_ATTR_VALUE_START+2
+#define WID_NUMBERINGSTARTVALUE OWN_ATTR_VALUE_START+3
+#define WID_PARAISNUMBERINGRESTART OWN_ATTR_VALUE_START+4
#define SVX_UNOEDIT_NUMBERING_PROPERTIE \
{MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, \
@@ -173,8 +168,8 @@ class SvxTextEditSource;
class SvxFieldData;
struct ESelection;
-SVX_DLLPUBLIC void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
-SVX_DLLPUBLIC void CheckSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
+EDITENG_DLLPUBLIC void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
+EDITENG_DLLPUBLIC void CheckSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
// ====================================================================
// Diese Klasse implementiert eine SvxEditSource und einen SvxTextForwarder
@@ -251,7 +246,7 @@ namespace accessibility
}
// ====================================================================
-class SVX_DLLPUBLIC SvxUnoTextRangeBase : public ::com::sun::star::text::XTextRange,
+class EDITENG_DLLPUBLIC SvxUnoTextRangeBase : public ::com::sun::star::text::XTextRange,
public ::com::sun::star::beans::XPropertySet,
public ::com::sun::star::beans::XMultiPropertySet,
public ::com::sun::star::beans::XMultiPropertyStates,
@@ -310,8 +305,8 @@ public:
const SvxItemPropertySet* getPropertySet() const throw() { return mpPropSet; }
SvxEditSource* GetEditSource() const throw() { return mpEditSource; }
- static sal_Bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxTextEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException );
- static sal_Bool GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::uno::Any& aAny, const ESelection* pSelection = NULL, SvxTextEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException );
+ static sal_Bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException );
+ static sal_Bool GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::uno::Any& aAny, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException );
void attachField( const SvxFieldData* pData ) throw();
@@ -364,7 +359,7 @@ public:
// ====================================================================
class SvxUnoTextBase;
-class SVX_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase,
+class EDITENG_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase,
public ::com::sun::star::lang::XTypeProvider,
public ::cppu::OWeakAggObject
{
@@ -397,7 +392,7 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
};
-class SVX_DLLPUBLIC SvxUnoTextBase : public SvxUnoTextRangeBase,
+class EDITENG_DLLPUBLIC SvxUnoTextBase : public SvxUnoTextRangeBase,
public ::com::sun::star::text::XTextAppend,
public ::com::sun::star::text::XTextCopy,
public ::com::sun::star::container::XEnumerationAccess,
@@ -474,7 +469,7 @@ public:
};
// ====================================================================
-class SVX_DLLPUBLIC SvxUnoText : public SvxUnoTextBase,
+class EDITENG_DLLPUBLIC SvxUnoText : public SvxUnoTextBase,
public ::cppu::OWeakAggObject
{
public:
@@ -622,7 +617,7 @@ public:
// ====================================================================
-class SVX_DLLPUBLIC SvxUnoTextCursor : public SvxUnoTextRangeBase,
+class EDITENG_DLLPUBLIC SvxUnoTextCursor : public SvxUnoTextRangeBase,
public ::com::sun::star::text::XTextCursor,
public ::com::sun::star::lang::XTypeProvider,
public ::cppu::OWeakAggObject
@@ -672,9 +667,9 @@ public:
};
-SVX_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet();
-SVX_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap();
-SVX_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet();
-SVX_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap();
+EDITENG_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet();
+EDITENG_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap();
+EDITENG_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet();
+EDITENG_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap();
#endif
diff --git a/svx/inc/svx/unoviwed.hxx b/editeng/inc/editeng/unoviwed.hxx
index 61cf2ed87411..8fb1638e9206 100644
--- a/svx/inc/svx/unoviwed.hxx
+++ b/editeng/inc/editeng/unoviwed.hxx
@@ -28,9 +28,9 @@
#ifndef _SVX_UNOVIWED_HXX
#define _SVX_UNOVIWED_HXX
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
class EditView;
diff --git a/svx/inc/svx/unoviwou.hxx b/editeng/inc/editeng/unoviwou.hxx
index 8d977ff2e4c6..b20c668eb7ee 100644
--- a/svx/inc/svx/unoviwou.hxx
+++ b/editeng/inc/editeng/unoviwou.hxx
@@ -28,19 +28,19 @@
#ifndef _SVX_UNOVIWOU_HXX
#define _SVX_UNOVIWOU_HXX
-#include <svx/unoedsrc.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/unoedsrc.hxx>
+#include <editeng/editengdllapi.h>
class OutlinerView;
/// Specialization for Draw/Impress
-class SVX_DLLPUBLIC SvxDrawOutlinerViewForwarder : public SvxEditViewForwarder
+class EDITENG_DLLPUBLIC SvxDrawOutlinerViewForwarder : public SvxEditViewForwarder
{
private:
OutlinerView& mrOutlinerView;
Point maTextShapeTopLeft;
- SVX_DLLPRIVATE Point GetTextOffset() const;
+ EDITENG_DLLPRIVATE Point GetTextOffset() const;
public:
explicit SvxDrawOutlinerViewForwarder( OutlinerView& rOutl );
diff --git a/svx/inc/svx/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
index fca8148883cc..76838f67bbd4 100644
--- a/svx/inc/svx/wghtitem.hxx
+++ b/editeng/inc/editeng/wghtitem.hxx
@@ -31,10 +31,7 @@
#include <vcl/vclenum.hxx>
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +46,7 @@ namespace rtl
Dieses Item beschreibt die Font-Staerke.
*/
-class SVX_DLLPUBLIC SvxWeightItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxWeightItem : public SfxEnumItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/widwitem.hxx b/editeng/inc/editeng/widwitem.hxx
index 420a853b7dcf..cf0c8c9d05c7 100644
--- a/svx/inc/svx/widwitem.hxx
+++ b/editeng/inc/editeng/widwitem.hxx
@@ -30,11 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/intitem.hxx>
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +45,7 @@ namespace rtl
Dieses Item beschreibt die Anzahl der Zeilen fuer die Hurenkinderregelung.
*/
-class SVX_DLLPUBLIC SvxWidowsItem: public SfxByteItem
+class EDITENG_DLLPUBLIC SvxWidowsItem: public SfxByteItem
{
friend SvStream & operator<<( SvStream & aS, SvxWidowsItem & );
public:
diff --git a/svx/inc/svx/writingmodeitem.hxx b/editeng/inc/editeng/writingmodeitem.hxx
index 434be92bd325..8a81f5291d27 100644
--- a/svx/inc/svx/writingmodeitem.hxx
+++ b/editeng/inc/editeng/writingmodeitem.hxx
@@ -31,12 +31,11 @@
#include <com/sun/star/text/WritingMode.hpp>
#include <svl/intitem.hxx>
-#include <svx/svddef.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
// class SvxWritingModeItem ----------------------------------------------
-class SVX_DLLPUBLIC SvxWritingModeItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxWritingModeItem : public SfxUInt16Item
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/wrlmitem.hxx b/editeng/inc/editeng/wrlmitem.hxx
index cb68444cd34b..322d3d87cbc0 100644
--- a/svx/inc/svx/wrlmitem.hxx
+++ b/editeng/inc/editeng/wrlmitem.hxx
@@ -30,10 +30,7 @@
// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
class SvXMLUnitConverter;
namespace rtl
@@ -49,7 +46,7 @@ namespace rtl
Wortgrenzen beschraenkt ist.
*/
-class SVX_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/xmlcnitm.hxx b/editeng/inc/editeng/xmlcnitm.hxx
index afbabe89a84d..70c49d03c143 100644
--- a/svx/inc/xmlcnitm.hxx
+++ b/editeng/inc/editeng/xmlcnitm.hxx
@@ -29,7 +29,7 @@
#define _SVX_XMLCNITM_HXX
#include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
class SvXMLNamespaceMap;
namespace rtl { class OUString; }
@@ -38,7 +38,7 @@ namespace rtl { class OUString; }
class SvXMLAttrContainerData;
-class SVX_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem
+class EDITENG_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem
{
SvXMLAttrContainerData *pImpl;
diff --git a/svx/source/inc/editxml.hxx b/editeng/inc/editxml.hxx
index 4a69d5e856b5..4a69d5e856b5 100644
--- a/svx/source/inc/editxml.hxx
+++ b/editeng/inc/editxml.hxx
diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc
new file mode 100644
index 000000000000..204f97842bf9
--- /dev/null
+++ b/editeng/inc/helpid.hrc
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: helpid.hrc,v $
+ * $Revision: 1.78 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDITENG_HELPID_HRC
+#define _EDITENG_HELPID_HRC
+
+// include ---------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+// Help-Ids --------------------------------------------------------------
+#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_EDIT_START)
+#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_EDIT_START + 1)
+#define HID_EDITENG_SPELLER_ADDWORD (HID_EDIT_START + 2)
+#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_EDIT_START + 3)
+#define HID_EDITENG_SPELLER_IGNORE (HID_EDIT_START + 4)
+#define HID_EDITENG_SPELLER_START (HID_EDIT_START + 5)
+#define HID_AUTOCORR_HELP_END (HID_EDIT_START + 6)
+#define HID_AUTOCORR_HELP_START (HID_EDIT_START + 7)
+#define HID_AUTOCORR_HELP_WORD HID_AUTOCORR_HELP_START
+
+#define HID_AUTOCORR_HELP_SENT (HID_AUTOCORR_HELP_START+1)
+#define HID_AUTOCORR_HELP_SENTWORD (HID_AUTOCORR_HELP_START+2)
+#define HID_AUTOCORR_HELP_ACORWORD (HID_AUTOCORR_HELP_START+3)
+
+#define HID_AUTOCORR_HELP_ACORSENTWORD (HID_AUTOCORR_HELP_START+5)
+
+#define HID_AUTOCORR_HELP_CHGTOENEMDASH (HID_AUTOCORR_HELP_START+7)
+#define HID_AUTOCORR_HELP_WORDENEMDASH (HID_AUTOCORR_HELP_START+8)
+#define HID_AUTOCORR_HELP_SENTENEMDASH (HID_AUTOCORR_HELP_START+9)
+#define HID_AUTOCORR_HELP_SENTWORDENEMDASH (HID_AUTOCORR_HELP_START+10)
+#define HID_AUTOCORR_HELP_ACORWORDENEMDASH (HID_AUTOCORR_HELP_START+11)
+
+#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH (HID_AUTOCORR_HELP_START+13)
+#define HID_AUTOCORR_HELP_CHGQUOTES (HID_AUTOCORR_HELP_START+15)
+#define HID_AUTOCORR_HELP_CHGSGLQUOTES (HID_AUTOCORR_HELP_START+16)
+#define HID_AUTOCORR_HELP_SETINETATTR (HID_AUTOCORR_HELP_START+17)
+#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE (HID_AUTOCORR_HELP_START+18)
+#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL (HID_AUTOCORR_HELP_START+19)
+#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL (HID_AUTOCORR_HELP_START+20)
+#define HID_AUTOCORR_HELP_CHGORDINALNUMBER (HID_AUTOCORR_HELP_START+21) // HID_EDIT_START + 28
+
+// please adjust ACT_SVX_HID_END2 below if you add entries here!
+
+// -----------------------------------------------------------------------
+// Overrun check ---------------------------------------------------------
+// -----------------------------------------------------------------------
+
+#define ACT_SVX_HID_END (HID_EDIT_START+28)
+#if ACT_SVX_HID_END > HID_EDIT_END
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+#endif
+
diff --git a/svx/source/svxlink/makefile.mk b/editeng/inc/makefile.mk
index 006d878e863b..6ecb444e03eb 100644
--- a/svx/source/svxlink/makefile.mk
+++ b/editeng/inc/makefile.mk
@@ -2,10 +2,14 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.5 $
+#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -25,15 +29,10 @@
#
#*************************************************************************
-PRJ=..$/..
+PRJ=..
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-PRJNAME=svx
-TARGET=svxlink
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
+PRJNAME=editeng
+TARGET=inc
# --- Settings -----------------------------------------------------
@@ -42,20 +41,12 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-SLOFILES=\
- $(SLO)$/linkmgr.obj \
- $(SLO)$/fileobj.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES= \
- linkmgr.src
-
-.IF "$(GUI)" == "WNT"
-NOOPTFILES=\
- $(SLO)$/fileobj.obj
-.ENDIF
-
-# ==========================================================================
-
.INCLUDE : target.mk
+.IF "$(ENABLE_PCH)"!=""
+ALLTAR : \
+ $(SLO)$/precompiled.pch \
+ $(SLO)$/precompiled_ex.pch
+
+.ENDIF # "$(ENABLE_PCH)"!=""
+
diff --git a/editeng/inc/pch/precompiled_editeng.cxx b/editeng/inc/pch/precompiled_editeng.cxx
new file mode 100644
index 000000000000..1b18cce1697c
--- /dev/null
+++ b/editeng/inc/pch/precompiled_editeng.cxx
@@ -0,0 +1,32 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: precompiled_svx.cxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_editeng.hxx"
+
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
new file mode 100644
index 000000000000..d82ecc6cb6b5
--- /dev/null
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -0,0 +1,897 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: precompiled_svx.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:08.279739
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "com/sun/star/accessibility/AccessibleEventId.hpp"
+#include "com/sun/star/accessibility/AccessibleEventObject.hpp"
+#include "com/sun/star/accessibility/AccessibleRelationType.hpp"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+#include "com/sun/star/accessibility/AccessibleStateType.hpp"
+#include "com/sun/star/accessibility/AccessibleTextType.hpp"
+#include "com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp"
+#include "com/sun/star/accessibility/TextSegment.hpp"
+#include "com/sun/star/accessibility/XAccessible.hpp"
+#include "com/sun/star/accessibility/XAccessibleAction.hpp"
+#include "com/sun/star/accessibility/XAccessibleContext.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventListener.hpp"
+#include "com/sun/star/accessibility/XAccessibleImage.hpp"
+#include "com/sun/star/accessibility/XAccessibleRelationSet.hpp"
+#include "com/sun/star/accessibility/XAccessibleSelection.hpp"
+#include "com/sun/star/accessibility/XAccessibleStateSet.hpp"
+#include "com/sun/star/accessibility/XAccessibleTable.hpp"
+#include "com/sun/star/accessibility/XAccessibleTextAttributes.hpp"
+#include "com/sun/star/accessibility/XAccessibleValue.hpp"
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FocusChangeReason.hpp"
+#include "com/sun/star/awt/FontDescriptor.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontType.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/FontWidth.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/GradientStyle.hpp"
+#include "com/sun/star/awt/Key.hpp"
+#include "com/sun/star/awt/KeyEvent.hpp"
+#include "com/sun/star/awt/KeyModifier.hpp"
+#include "com/sun/star/awt/LineEndFormat.hpp"
+#include "com/sun/star/awt/PosSize.hpp"
+#include "com/sun/star/awt/RasterOperation.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/ScrollBarOrientation.hpp"
+#include "com/sun/star/awt/SimpleFontMetric.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/TextAlign.hpp"
+#include "com/sun/star/awt/VisualEffect.hpp"
+#include "com/sun/star/awt/WindowAttribute.hpp"
+#include "com/sun/star/awt/WindowDescriptor.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/awt/XCheckBox.hpp"
+#include "com/sun/star/awt/XComboBox.hpp"
+#include "com/sun/star/awt/XControl.hpp"
+#include "com/sun/star/awt/XControlContainer.hpp"
+#include "com/sun/star/awt/XControlModel.hpp"
+#include "com/sun/star/awt/XDevice.hpp"
+#include "com/sun/star/awt/XFocusListener.hpp"
+#include "com/sun/star/awt/XFont.hpp"
+#include "com/sun/star/awt/XGraphics.hpp"
+#include "com/sun/star/awt/XImageConsumer.hpp"
+#include "com/sun/star/awt/XItemListener.hpp"
+#include "com/sun/star/awt/XLayoutConstrains.hpp"
+#include "com/sun/star/awt/XListBox.hpp"
+#include "com/sun/star/awt/XMouseListener.hpp"
+#include "com/sun/star/awt/XProgressMonitor.hpp"
+#include "com/sun/star/awt/XTabController.hpp"
+#include "com/sun/star/awt/XTabControllerModel.hpp"
+#include "com/sun/star/awt/XTextListener.hpp"
+#include "com/sun/star/awt/XToolkit.hpp"
+#include "com/sun/star/awt/XVclWindowPeer.hpp"
+#include "com/sun/star/awt/XWindow.hpp"
+#include "com/sun/star/awt/XWindowListener.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/beans/NamedValue.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyChangeEvent.hpp"
+#include "com/sun/star/beans/PropertyState.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyValues.hdl"
+#include "com/sun/star/beans/PropertyValues.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include "com/sun/star/beans/XIntrospection.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart/ChartAxisArrangeOrderType.hpp"
+#include "com/sun/star/container/ContainerEvent.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XChild.hpp"
+#include "com/sun/star/container/XContainer.hpp"
+#include "com/sun/star/container/XContainerListener.hpp"
+#include "com/sun/star/container/XContainerQuery.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XEnumerationAccess.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XIdentifierContainer.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XIndexReplace.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/container/XNameReplace.hpp"
+#include "com/sun/star/container/XNamed.hpp"
+#include "com/sun/star/container/XSet.hpp"
+#include "com/sun/star/datatransfer/DataFlavor.hpp"
+#include "com/sun/star/datatransfer/XTransferable.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp"
+#include "com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp"
+#include "com/sun/star/datatransfer/dnd/DNDConstants.hpp"
+#include "com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp"
+#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
+#include "com/sun/star/document/EventObject.hpp"
+#include "com/sun/star/document/UpdateDocMode.hpp"
+#include "com/sun/star/document/XActionLockable.hpp"
+#include "com/sun/star/document/XBinaryStreamResolver.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEmbeddedObjectResolver.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventListener.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XExporter.hpp"
+#include "com/sun/star/document/XFilter.hpp"
+#include "com/sun/star/document/XGraphicObjectResolver.hpp"
+#include "com/sun/star/document/XImporter.hpp"
+#include "com/sun/star/document/XLinkTargetSupplier.hpp"
+#include "com/sun/star/document/XMimeTypeInfo.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CameraGeometry.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/ColorMode.hpp"
+#include "com/sun/star/drawing/ConnectionType.hpp"
+#include "com/sun/star/drawing/ConnectorType.hpp"
+#include "com/sun/star/drawing/DashStyle.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameter.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegment.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "com/sun/star/drawing/LineDash.hpp"
+#include "com/sun/star/drawing/LineJoint.hpp"
+#include "com/sun/star/drawing/LineStyle.hpp"
+#include "com/sun/star/drawing/MeasureKind.hpp"
+#include "com/sun/star/drawing/MeasureTextHorzPos.hpp"
+#include "com/sun/star/drawing/MeasureTextVertPos.hpp"
+#include "com/sun/star/drawing/NormalsKind.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonFlags.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextAdjust.hpp"
+#include "com/sun/star/drawing/TextAnimationDirection.hpp"
+#include "com/sun/star/drawing/TextAnimationKind.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/TextureKind.hpp"
+#include "com/sun/star/drawing/TextureMode.hpp"
+#include "com/sun/star/drawing/TextureProjectionMode.hpp"
+#include "com/sun/star/drawing/XGluePointsSupplier.hpp"
+#include "com/sun/star/drawing/XShapeDescriptor.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/ElementModes.hpp"
+#include "com/sun/star/embed/EmbedMisc.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/EntryInitModes.hpp"
+#include "com/sun/star/embed/NoVisualAreaSizeException.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedObjectFactory.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XInsertObjectDialog.hpp"
+#include "com/sun/star/embed/XLinkageSupport.hpp"
+#include "com/sun/star/embed/XStorage.hpp"
+#include "com/sun/star/embed/XTransactedObject.hpp"
+#include "com/sun/star/form/DatabaseDeleteEvent.hpp"
+#include "com/sun/star/form/DatabaseParameterEvent.hpp"
+#include "com/sun/star/form/ErrorEvent.hpp"
+#include "com/sun/star/form/FormButtonType.hpp"
+#include "com/sun/star/form/FormComponentType.hpp"
+#include "com/sun/star/form/ListSourceType.hpp"
+#include "com/sun/star/form/NavigationBarMode.hpp"
+#include "com/sun/star/form/TabulatorCycle.hpp"
+#include "com/sun/star/form/XBoundComponent.hpp"
+#include "com/sun/star/form/XBoundControl.hpp"
+#include "com/sun/star/form/XConfirmDeleteBroadcaster.hpp"
+#include "com/sun/star/form/XConfirmDeleteListener.hpp"
+#include "com/sun/star/form/XDatabaseParameterBroadcaster2.hpp"
+#include "com/sun/star/form/XDatabaseParameterListener.hpp"
+#include "com/sun/star/form/XForm.hpp"
+#include "com/sun/star/form/XFormComponent.hpp"
+#include "com/sun/star/form/XFormController.hpp"
+#include "com/sun/star/form/XFormControllerListener.hpp"
+#include "com/sun/star/form/XFormsSupplier.hpp"
+#include "com/sun/star/form/XFormsSupplier2.hpp"
+#include "com/sun/star/form/XGrid.hpp"
+#include "com/sun/star/form/XGridColumnFactory.hpp"
+#include "com/sun/star/form/XGridFieldDataSupplier.hpp"
+#include "com/sun/star/form/XGridPeer.hpp"
+#include "com/sun/star/form/XImageProducerSupplier.hpp"
+#include "com/sun/star/form/XLoadListener.hpp"
+#include "com/sun/star/form/XLoadable.hpp"
+#include "com/sun/star/form/XReset.hpp"
+#include "com/sun/star/form/XResetListener.hpp"
+#include "com/sun/star/form/binding/XBindableValue.hpp"
+#include "com/sun/star/form/binding/XListEntrySink.hpp"
+#include "com/sun/star/form/binding/XValueBinding.hpp"
+#include "com/sun/star/form/submission/XSubmissionSupplier.hpp"
+#include "com/sun/star/form/validation/XFormComponentValidityListener.hpp"
+#include "com/sun/star/form/validation/XValidatableFormComponent.hpp"
+#include "com/sun/star/frame/DispatchDescriptor.hpp"
+#include "com/sun/star/frame/DispatchInformation.hpp"
+#include "com/sun/star/frame/FeatureStateEvent.hpp"
+#include "com/sun/star/frame/FrameSearchFlag.hpp"
+#include "com/sun/star/frame/XComponentLoader.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchInformationProvider.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XDispatchProviderInterception.hpp"
+#include "com/sun/star/frame/XDispatchProviderInterceptor.hpp"
+#include "com/sun/star/frame/XFrame.hpp"
+#include "com/sun/star/frame/XFrameActionListener.hpp"
+#include "com/sun/star/frame/XFrames.hpp"
+#include "com/sun/star/frame/XFramesSupplier.hpp"
+#include "com/sun/star/frame/XInterceptorInfo.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XModuleManager.hpp"
+#include "com/sun/star/frame/XStatusListener.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousDispatch.hpp"
+#include "com/sun/star/frame/status/ClipboardFormats.hpp"
+#include "com/sun/star/frame/status/FontHeight.hpp"
+#include "com/sun/star/frame/status/ItemStatus.hpp"
+#include "com/sun/star/frame/status/LeftRightMargin.hpp"
+#include "com/sun/star/frame/status/UpperLowerMargin.hpp"
+#include "com/sun/star/frame/status/UpperLowerMarginScale.hpp"
+#include "com/sun/star/gallery/GalleryItemType.hpp"
+#include "com/sun/star/gallery/XGalleryItem.hpp"
+#include "com/sun/star/gallery/XGalleryTheme.hpp"
+#include "com/sun/star/gallery/XGalleryThemeProvider.hpp"
+#include "com/sun/star/graphic/XGraphic.hpp"
+#include "com/sun/star/graphic/XGraphicProvider.hpp"
+#include "com/sun/star/graphic/XGraphicRenderer.hpp"
+#include "com/sun/star/i18n/CharacterIteratorMode.hdl"
+#include "com/sun/star/i18n/CharacterIteratorMode.hpp"
+#include "com/sun/star/i18n/CollatorOptions.hpp"
+#include "com/sun/star/i18n/ForbiddenCharacters.hpp"
+#include "com/sun/star/i18n/InputSequenceCheckMode.hpp"
+#include "com/sun/star/i18n/KCharacterType.hpp"
+#include "com/sun/star/i18n/ScriptType.hdl"
+#include "com/sun/star/i18n/ScriptType.hpp"
+#include "com/sun/star/i18n/TextConversionOption.hdl"
+#include "com/sun/star/i18n/TextConversionOption.hpp"
+#include "com/sun/star/i18n/TextConversionType.hpp"
+#include "com/sun/star/i18n/TransliterationModules.hpp"
+#include "com/sun/star/i18n/UnicodeScript.hpp"
+#include "com/sun/star/i18n/UnicodeType.hdl"
+#include "com/sun/star/i18n/WordType.hpp"
+#include "com/sun/star/i18n/XBreakIterator.hpp"
+#include "com/sun/star/i18n/XExtendedInputSequenceChecker.hpp"
+#include "com/sun/star/i18n/XExtendedTextConversion.hpp"
+#include "com/sun/star/i18n/XForbiddenCharacters.hpp"
+#include "com/sun/star/i18n/XTextConversion.hpp"
+#include "com/sun/star/inspection/XObjectInspector.hpp"
+#include "com/sun/star/inspection/XObjectInspectorModel.hpp"
+#include "com/sun/star/io/IOException.hpp"
+#include "com/sun/star/io/XActiveDataControl.hpp"
+#include "com/sun/star/io/XActiveDataSink.hpp"
+#include "com/sun/star/io/XActiveDataSource.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/io/XInputStreamProvider.hpp"
+#include "com/sun/star/io/XMarkableStream.hpp"
+#include "com/sun/star/io/XObjectInputStream.hpp"
+#include "com/sun/star/io/XObjectOutputStream.hpp"
+#include "com/sun/star/io/XOutputStream.hpp"
+#include "com/sun/star/io/XPersistObject.hpp"
+#include "com/sun/star/io/XSeekable.hdl"
+#include "com/sun/star/io/XStream.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/NoSupportException.hpp"
+#include "com/sun/star/lang/ServiceNotRegisteredException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/lang/XServiceDisplayName.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/linguistic2/ConversionDictionaryType.hpp"
+#include "com/sun/star/linguistic2/ConversionDirection.hdl"
+#include "com/sun/star/linguistic2/ConversionPropertyType.hpp"
+#include "com/sun/star/linguistic2/DictionaryEvent.hpp"
+#include "com/sun/star/linguistic2/DictionaryEventFlags.hpp"
+#include "com/sun/star/linguistic2/DictionaryListEvent.hpp"
+#include "com/sun/star/linguistic2/DictionaryListEventFlags.hpp"
+#include "com/sun/star/linguistic2/DictionaryType.hpp"
+#include "com/sun/star/linguistic2/SpellFailure.hpp"
+#include "com/sun/star/linguistic2/XAvailableLocales.hpp"
+#include "com/sun/star/linguistic2/XConversionDictionary.hpp"
+#include "com/sun/star/linguistic2/XConversionDictionaryList.hpp"
+#include "com/sun/star/linguistic2/XConversionPropertyType.hpp"
+#include "com/sun/star/linguistic2/XDictionary.hpp"
+#include "com/sun/star/linguistic2/XDictionary1.hpp"
+#include "com/sun/star/linguistic2/XDictionaryEntry.hpp"
+#include "com/sun/star/linguistic2/XDictionaryEventListener.hpp"
+#include "com/sun/star/linguistic2/XDictionaryList.hpp"
+#include "com/sun/star/linguistic2/XDictionaryListEventListener.hpp"
+#include "com/sun/star/linguistic2/XHyphenatedWord.hpp"
+#include "com/sun/star/linguistic2/XHyphenator.hpp"
+#include "com/sun/star/linguistic2/XLinguServiceManager.hdl"
+#include "com/sun/star/linguistic2/XLinguServiceManager.hpp"
+#include "com/sun/star/linguistic2/XMeaning.hpp"
+#include "com/sun/star/linguistic2/XPossibleHyphens.hpp"
+#include "com/sun/star/linguistic2/XSpellAlternatives.hpp"
+#include "com/sun/star/linguistic2/XSpellChecker.hpp"
+#include "com/sun/star/linguistic2/XSpellChecker1.hpp"
+#include "com/sun/star/linguistic2/XSupportedLocales.hpp"
+#include "com/sun/star/linguistic2/XThesaurus.hpp"
+#include "com/sun/star/media/XPlayer.hpp"
+#include "com/sun/star/media/ZoomLevel.hpp"
+#include "com/sun/star/plugin/PluginDescription.hpp"
+#include "com/sun/star/plugin/XPluginManager.hpp"
+#include "com/sun/star/reflection/XIdlClass.hpp"
+#include "com/sun/star/reflection/XIdlMethod.hpp"
+#include "com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp"
+#include "com/sun/star/reflection/XProxyFactory.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/registry/XSimpleRegistry.hpp"
+#include "com/sun/star/script/ScriptEvent.hpp"
+#include "com/sun/star/script/ScriptEventDescriptor.hpp"
+#include "com/sun/star/script/XEventAttacherManager.hpp"
+#include "com/sun/star/script/XInvocation.hpp"
+#include "com/sun/star/script/XLibraryContainer.hpp"
+#include "com/sun/star/script/XScriptListener.hpp"
+#include "com/sun/star/script/XTypeConverter.hpp"
+#include "com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp"
+#include "com/sun/star/script/browse/BrowseNodeTypes.hpp"
+#include "com/sun/star/script/browse/XBrowseNode.hpp"
+#include "com/sun/star/script/browse/XBrowseNodeFactory.hpp"
+#include "com/sun/star/script/provider/ScriptErrorRaisedException.hpp"
+#include "com/sun/star/script/provider/ScriptExceptionRaisedException.hpp"
+#include "com/sun/star/script/provider/ScriptFrameworkErrorType.hpp"
+#include "com/sun/star/script/provider/XScriptProvider.hpp"
+#include "com/sun/star/script/provider/XScriptProviderSupplier.hpp"
+#include "com/sun/star/sdb/CommandType.hpp"
+#include "com/sun/star/sdb/ParametersRequest.hpp"
+#include "com/sun/star/sdb/RowChangeAction.hpp"
+#include "com/sun/star/sdb/RowChangeEvent.hpp"
+#include "com/sun/star/sdb/SQLContext.hpp"
+#include "com/sun/star/sdb/SQLErrorEvent.hpp"
+#include "com/sun/star/sdb/XColumn.hpp"
+#include "com/sun/star/sdb/XColumnUpdate.hpp"
+#include "com/sun/star/sdb/XCompletedConnection.hpp"
+#include "com/sun/star/sdb/XInteractionSupplyParameters.hpp"
+#include "com/sun/star/sdb/XQueriesSupplier.hpp"
+#include "com/sun/star/sdb/XResultSetAccess.hpp"
+#include "com/sun/star/sdb/XRowSetApproveBroadcaster.hpp"
+#include "com/sun/star/sdb/XRowSetApproveListener.hpp"
+#include "com/sun/star/sdb/XRowSetSupplier.hpp"
+#include "com/sun/star/sdb/XSQLErrorBroadcaster.hpp"
+#include "com/sun/star/sdb/XSQLErrorListener.hpp"
+#include "com/sun/star/sdb/XSQLQueryComposer.hpp"
+#include "com/sun/star/sdb/XSQLQueryComposerFactory.hpp"
+#include "com/sun/star/sdb/XSingleSelectQueryComposer.hpp"
+#include "com/sun/star/sdbc/ColumnValue.hpp"
+#include "com/sun/star/sdbc/DataType.hpp"
+#include "com/sun/star/sdbc/ResultSetConcurrency.hpp"
+#include "com/sun/star/sdbc/ResultSetType.hpp"
+#include "com/sun/star/sdbc/XConnection.hpp"
+#include "com/sun/star/sdbc/XDataSource.hpp"
+#include "com/sun/star/sdbc/XDatabaseMetaData.hpp"
+#include "com/sun/star/sdbc/XPreparedStatement.hpp"
+#include "com/sun/star/sdbc/XResultSet.hpp"
+#include "com/sun/star/sdbc/XResultSetUpdate.hpp"
+#include "com/sun/star/sdbc/XRow.hpp"
+#include "com/sun/star/sdbc/XRowSet.hpp"
+#include "com/sun/star/sdbc/XRowSetListener.hpp"
+#include "com/sun/star/sdbc/XStatement.hpp"
+#include "com/sun/star/sdbcx/Privilege.hpp"
+#include "com/sun/star/sdbcx/XColumnsSupplier.hpp"
+#include "com/sun/star/sdbcx/XDataDescriptorFactory.hpp"
+#include "com/sun/star/sdbcx/XDeleteRows.hpp"
+#include "com/sun/star/sdbcx/XRowLocate.hpp"
+#include "com/sun/star/sdbcx/XTablesSupplier.hpp"
+#include "com/sun/star/security/XDocumentDigitalSignatures.hpp"
+#include "com/sun/star/style/BreakType.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/GraphicLocation.hpp"
+#include "com/sun/star/style/LineSpacing.hpp"
+#include "com/sun/star/style/LineSpacingMode.hpp"
+#include "com/sun/star/style/NumberingType.hpp"
+#include "com/sun/star/style/PageStyleLayout.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/TabStop.hpp"
+#include "com/sun/star/style/VerticalAlignment.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/table/BorderLine.hpp"
+#include "com/sun/star/table/CellAddress.hpp"
+#include "com/sun/star/table/CellContentType.hpp"
+#include "com/sun/star/table/CellHoriJustify.hpp"
+#include "com/sun/star/table/CellOrientation.hpp"
+#include "com/sun/star/table/CellRangeAddress.hpp"
+#include "com/sun/star/table/CellVertJustify.hpp"
+#include "com/sun/star/table/ShadowFormat.hpp"
+#include "com/sun/star/table/ShadowLocation.hpp"
+#include "com/sun/star/table/TableBorder.hpp"
+#include "com/sun/star/table/TableOrientation.hpp"
+#include "com/sun/star/task/XInteractionHandler.hpp"
+#include "com/sun/star/task/XStatusIndicator.hpp"
+#include "com/sun/star/task/XStatusIndicatorFactory.hpp"
+#include "com/sun/star/text/CharacterCompressionType.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FilenameDisplayFormat.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/GraphicCrop.hpp"
+#include "com/sun/star/text/HoriOrientation.hpp"
+#include "com/sun/star/text/RelOrientation.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/TextContentAnchorType.hpp"
+#include "com/sun/star/text/VertOrientation.hpp"
+#include "com/sun/star/text/WrapTextMode.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XDefaultNumberingProvider.hpp"
+#include "com/sun/star/text/XNumberingFormatter.hpp"
+#include "com/sun/star/text/XNumberingTypeInfo.hpp"
+#include "com/sun/star/text/XRubySelection.hpp"
+#include "com/sun/star/text/XSimpleText.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextContent.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextField.hdl"
+#include "com/sun/star/text/XTextField.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/text/XTextRangeCompare.hpp"
+#include "com/sun/star/text/XTextRangeMover.hpp"
+#include "com/sun/star/ucb/CommandAbortedException.hpp"
+#include "com/sun/star/ucb/NameClash.hpp"
+#include "com/sun/star/ucb/NumberedSortingInfo.hpp"
+#include "com/sun/star/ucb/TransferInfo.hpp"
+#include "com/sun/star/ucb/XAnyCompare.hpp"
+#include "com/sun/star/ucb/XAnyCompareFactory.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+#include "com/sun/star/ucb/XContent.hpp"
+#include "com/sun/star/ucb/XContentAccess.hpp"
+#include "com/sun/star/ucb/XContentProvider.hpp"
+#include "com/sun/star/ucb/XSimpleFileAccess.hpp"
+#include "com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp"
+#include "com/sun/star/ui/ImageType.hpp"
+#include "com/sun/star/ui/ItemStyle.hpp"
+#include "com/sun/star/ui/ItemType.hpp"
+#include "com/sun/star/ui/UIElementType.hpp"
+#include "com/sun/star/ui/XImageManager.hpp"
+#include "com/sun/star/ui/XModuleUIConfigurationManager.hpp"
+#include "com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp"
+#include "com/sun/star/ui/XUIConfiguration.hpp"
+#include "com/sun/star/ui/XUIConfigurationListener.hpp"
+#include "com/sun/star/ui/XUIConfigurationManager.hpp"
+#include "com/sun/star/ui/XUIConfigurationManagerSupplier.hpp"
+#include "com/sun/star/ui/XUIConfigurationPersistence.hpp"
+#include "com/sun/star/ui/XUIConfigurationStorage.hpp"
+#include "com/sun/star/ui/XUIElement.hpp"
+#include "com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp"
+#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
+#include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp"
+#include "com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp"
+#include "com/sun/star/ui/dialogs/ListboxControlActions.hpp"
+#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp"
+#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerListener.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerNotifier.hpp"
+#include "com/sun/star/ui/dialogs/XFilePreview.hpp"
+#include "com/sun/star/ui/dialogs/XFilterManager.hpp"
+#include "com/sun/star/ui/dialogs/XFolderPicker.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.h"
+#include "com/sun/star/uno/XAggregation.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/util/Date.hpp"
+#include "com/sun/star/util/DateTime.hpp"
+#include "com/sun/star/util/Language.hpp"
+#include "com/sun/star/util/MeasureUnit.hpp"
+#include "com/sun/star/util/NumberFormat.hpp"
+#include "com/sun/star/util/SearchAlgorithms.hpp"
+#include "com/sun/star/util/SearchFlags.hpp"
+#include "com/sun/star/util/SearchOptions.hpp"
+#include "com/sun/star/util/SearchResult.hpp"
+#include "com/sun/star/util/SortField.hpp"
+#include "com/sun/star/util/SortFieldType.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCancellable.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XFlushable.hpp"
+#include "com/sun/star/util/XLocalizedAliases.hpp"
+#include "com/sun/star/util/XModeChangeBroadcaster.hpp"
+#include "com/sun/star/util/XModeChangeListener.hpp"
+#include "com/sun/star/util/XModeSelector.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XModifyBroadcaster.hpp"
+#include "com/sun/star/util/XModifyListener.hpp"
+#include "com/sun/star/util/XNumberFormatTypes.hpp"
+#include "com/sun/star/util/XNumberFormats.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XNumberFormatter.hpp"
+#include "com/sun/star/util/XTextSearch.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/util/logging/LogLevel.hpp"
+#include "com/sun/star/util/logging/XLogger.hpp"
+#include "com/sun/star/view/XSelectionChangeListener.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+#include "com/sun/star/xforms/XFormsSupplier.hpp"
+#include "com/sun/star/xforms/XFormsUIHelper1.hpp"
+#include "com/sun/star/xforms/XModel.hpp"
+#include "com/sun/star/xforms/XSubmission.hpp"
+#include "com/sun/star/xml/AttributeData.hpp"
+#include "com/sun/star/xml/dom/DOMException.hpp"
+#include "com/sun/star/xml/dom/XDocument.hpp"
+#include "com/sun/star/xml/dom/XNode.hpp"
+#include "com/sun/star/xml/dom/events/XEventListener.hpp"
+#include "com/sun/star/xml/dom/events/XEventTarget.hpp"
+#include "com/sun/star/xml/sax/InputSource.hpp"
+#include "com/sun/star/xml/sax/SAXParseException.hpp"
+#include "com/sun/star/xml/sax/XAttributeList.hpp"
+#include "com/sun/star/xml/sax/XDocumentHandler.hpp"
+#include "com/sun/star/xml/sax/XParser.hpp"
+#include "comphelper/accessibleeventnotifier.hxx"
+#include "comphelper/anytostring.hxx"
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/componentcontext.hxx"
+#include "comphelper/configurationhelper.hxx"
+#include "comphelper/container.hxx"
+#include "comphelper/embeddedobjectcontainer.hxx"
+#include "comphelper/enumhelper.hxx"
+#include "comphelper/implementationreference.hxx"
+#include "comphelper/interaction.hxx"
+#include "comphelper/numbers.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/propertysethelper.hxx"
+#include "comphelper/regpathhelper.hxx"
+#include "comphelper/scopeguard.hxx"
+#include "comphelper/seqstream.hxx"
+#include "comphelper/sequence.hxx"
+#include "comphelper/sequenceashashmap.hxx"
+#include "comphelper/sequenceasvector.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "comphelper/storagehelper.hxx"
+#include "comphelper/types.hxx"
+#include "comphelper/uno3.hxx"
+#include "cppuhelper/bootstrap.hxx"
+#include "cppuhelper/compbase12.hxx"
+#include "cppuhelper/compbase2.hxx"
+#include "cppuhelper/compbase3.hxx"
+#include "cppuhelper/compbase4.hxx"
+#include "cppuhelper/compbase6.hxx"
+#include "cppuhelper/compbase7.hxx"
+#include "cppuhelper/component.hxx"
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/exc_hlp.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase11.hxx"
+#include "cppuhelper/implbase12.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implbase4.hxx"
+#include "cppuhelper/implbase5.hxx"
+#include "cppuhelper/implbase6.hxx"
+#include "cppuhelper/implbase8.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.h"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/servicefactory.hxx"
+#include "cppuhelper/typeprovider.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakagg.hxx"
+#include "cppuhelper/weakref.hxx"
+#include "i18npool/lang.h"
+#include "i18npool/mslangid.hxx"
+#include "linguistic/lngprops.hxx"
+#include "osl/diagnose.h"
+#include "osl/endian.h"
+#include "osl/file.hxx"
+#include "osl/interlck.h"
+#include "osl/module.h"
+#include "osl/module.hxx"
+#include "osl/mutex.hxx"
+#include "osl/nlsupport.h"
+#include "osl/process.h"
+#include "osl/security.hxx"
+#include "rsc/rscsfx.hxx"
+#include "rtl/bootstrap.hxx"
+#include "rtl/cipher.h"
+#include "rtl/crc.h"
+#include "rtl/digest.h"
+#include "rtl/locale.h"
+#include "rtl/logfile.hxx"
+#include "rtl/math.hxx"
+#include "rtl/memory.h"
+#include "rtl/tencinfo.h"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+#include "sal/config.h"
+#include "sal/main.h"
+#include "sal/types.h"
+#include "svl/srchdefs.hxx"
+#include "sot/clsids.hxx"
+#include "sot/exchange.hxx"
+#include "sot/factory.hxx"
+#include "sot/formats.hxx"
+#include <map>
+#include <set>
+#include <slist>
+#include <vector>
+#include "svtools/FilterConfigItem.hxx"
+#include "svtools/accessibilityoptions.hxx"
+#include "svl/adrparse.hxx"
+#include "svtools/apearcfg.hxx"
+#include "svl/brdcst.hxx"
+#include "unotools/cacheoptions.hxx"
+#include "svl/cancel.hxx"
+#include "svl/cjkoptions.hxx"
+#include "unotools/cmdoptions.hxx"
+#include "svl/cntwall.hxx"
+#include "svtools/colorcfg.hxx"
+#include "svl/ctloptions.hxx"
+#include "unotools/defaultoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
+#include "svtools/ehdl.hxx"
+#include "svl/eitem.hxx"
+#include "unotools/eventcfg.hxx"
+#include "unotools/extendedsecurityoptions.hxx"
+#include "svl/filenotation.hxx"
+#include "svl/flagitem.hxx"
+#include "unotools/fltrcfg.hxx"
+#include "unotools/fontoptions.hxx"
+#include "svtools/fontsubstconfig.hxx"
+#include "svtools/helpopt.hxx"
+#include "svl/hint.hxx"
+#include "svtools/htmlkywd.hxx"
+#include "svtools/htmltokn.h"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/javaoptions.hxx"
+#include "svl/languageoptions.hxx"
+#include "unotools/lingucfg.hxx"
+#include "unotools/linguprops.hxx"
+#include "svl/lngmisc.hxx"
+#include "svtools/localresaccess.hxx"
+#include "svl/lstner.hxx"
+#include "svl/macitem.hxx"
+#include "svtools/menuoptions.hxx"
+#include "svl/metitem.hxx"
+#include "unotools/misccfg.hxx"
+#include "svtools/miscopt.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/numuno.hxx"
+#include "unotools/optionsdlg.hxx"
+#include "svtools/parhtml.hxx"
+#include "svtools/parrtf.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/pickerhelper.hxx"
+#include "svl/poolitem.hxx"
+#include "unotools/printwarningoptions.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
+#include "svl/rngitem.hxx"
+#include "svtools/rtfkeywd.hxx"
+#include "svtools/rtfout.hxx"
+#include "svtools/rtftoken.h"
+#include "unotools/saveopt.hxx"
+#include "unotools/searchopt.hxx"
+#include "unotools/securityoptions.hxx"
+#include "svl/sfontitm.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
+#include "svtools/soerr.hxx"
+#include "unotools/sourceviewconfig.hxx"
+#include "unotools/startoptions.hxx"
+#include "svtools/stdmenu.hxx"
+#include "svtools/stringtransfer.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "unotools/syslocaleoptions.hxx"
+#include "svl/szitem.hxx"
+#include "svtools/textdata.hxx"
+#include "svtools/transfer.hxx"
+#include "svtools/txtcmp.hxx"
+#include "svl/undo.hxx"
+#include "unotools/undoopt.hxx"
+#include "svtools/unoevent.hxx"
+#include "svtools/unoimap.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
+#include "unotools/viewoptions.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
+#include "sys/stat.h"
+#include "sys/types.h"
+#include "toolkit/awt/vclxdevice.hxx"
+#include "toolkit/controls/unocontrol.hxx"
+#include "tools/bigint.hxx"
+#include "tools/color.hxx"
+#include "tools/config.hxx"
+#include "tools/contnr.hxx"
+#include "tools/debug.hxx"
+#include "tools/diagnose_ex.h"
+#include "tools/dynary.hxx"
+#include "tools/errcode.hxx"
+#include "tools/errinf.hxx"
+#include "tools/fract.hxx"
+#include "tools/gen.hxx"
+#include "tools/globname.hxx"
+#include "tools/inetdef.hxx"
+#include "tools/line.hxx"
+#include "tools/link.hxx"
+#include "tools/list.hxx"
+#include "tools/multisel.hxx"
+#include "tools/poly.hxx"
+#include "tools/rc.h"
+#include "tools/rc.hxx"
+#include "tools/rcid.h"
+#include "tools/ref.hxx"
+#include "tools/resary.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/rtti.hxx"
+#include "tools/shl.hxx"
+#include "tools/solar.h"
+#include "tools/stack.hxx"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/tenccvt.hxx"
+#include "tools/urlobj.hxx"
+#include "tools/vcompat.hxx"
+#include "tools/vector2d.hxx"
+#include "tools/weakbase.hxx"
+#include "tools/wldcrd.hxx"
+#include "tools/zcodec.hxx"
+#include "ucbhelper/commandenvironment.hxx"
+#include "ucbhelper/configurationkeys.hxx"
+#include "ucbhelper/content.hxx"
+#include "ucbhelper/contentbroker.hxx"
+#include "unicode/ubidi.h"
+#include "uno/lbnames.h"
+#include "uno/mapping.hxx"
+#include "unotools/accessiblerelationsethelper.hxx"
+#include "unotools/accessiblestatesethelper.hxx"
+#include "unotools/bootstrap.hxx"
+#include "unotools/charclass.hxx"
+#include "unotools/collatorwrapper.hxx"
+#include "unotools/configitem.hxx"
+#include "unotools/configmgr.hxx"
+#include "unotools/confignode.hxx"
+#include "unotools/configpathes.hxx"
+#include "unotools/configvaluecontainer.hxx"
+#include "unotools/localfilehelper.hxx"
+#include "unotools/processfactory.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "unotools/streamwrap.hxx"
+#include "unotools/textsearch.hxx"
+#include "unotools/transliterationwrapper.hxx"
+#include "unotools/ucbhelper.hxx"
+#include "vcl/abstdlg.hxx"
+#include "vcl/animate.hxx"
+#include "vcl/bitmap.hxx"
+#include "vcl/bitmapex.hxx"
+#include "vcl/bmpacc.hxx"
+#include "vcl/cmdevt.h"
+#include "vcl/configsettings.hxx"
+#include "vcl/controllayout.hxx"
+#include "vcl/cursor.hxx"
+#include "vcl/decoview.hxx"
+#include "vcl/dndhelp.hxx"
+#include "vcl/fldunit.hxx"
+#include "vcl/fntstyle.hxx"
+#include "unotools/fontcvt.hxx"
+#include "vcl/gdimtf.hxx"
+#include "vcl/help.hxx"
+#include "vcl/image.hxx"
+#include "vcl/jobset.hxx"
+#include "vcl/keycodes.hxx"
+#include "vcl/mapmod.hxx"
+#include "vcl/menu.hxx"
+#include "vcl/mnemonic.hxx"
+#include "vcl/pointr.hxx"
+#include "vcl/region.hxx"
+#include "vcl/salbtype.hxx"
+#include "vcl/stdtext.hxx"
+#include "vcl/timer.hxx"
+#include "vcl/unohelp.hxx"
+#include "vcl/unohelp2.hxx"
+#include "vcl/wall.hxx"
+#include "vcl/wintypes.hxx"
+#include "vos/mutex.hxx"
+#include "vos/ref.hxx"
+#include "vos/refernce.hxx"
+#include "vos/thread.hxx"
+#include "vos/xception.hxx"
+#include "xmloff/DashStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
+#include "xmloff/attrlist.hxx"
+#include "xmloff/nmspmap.hxx"
+#include "xmloff/xmlcnimp.hxx"
+#include "xmloff/xmlictxt.hxx"
+#include "xmloff/xmlnmspe.hxx"
+#include "xmloff/xmlstyle.hxx"
+#include "xmloff/xmltoken.hxx"
+//---MARKER---
+#endif
+
diff --git a/editeng/prj/build.lst b/editeng/prj/build.lst
new file mode 100644
index 000000000000..551a21bc37f2
--- /dev/null
+++ b/editeng/prj/build.lst
@@ -0,0 +1,13 @@
+ed editeng : l10n svtools xmloff linguistic NULL
+ed editeng usr1 - all ed_mkout NULL
+ed editeng\inc nmake - all ed_inc NULL
+ed editeng\source\items nmake - all ed_items ed_inc NULL
+ed editeng\source\editeng nmake - all ed_eeng ed_inc NULL
+ed editeng\source\misc nmake - all ed_misc ed_inc NULL
+ed editeng\source\outliner nmake - all ed_outl ed_inc NULL
+ed editeng\source\rtf nmake - all ed_rtf ed_inc NULL
+ed editeng\source\uno nmake - all ed_uno ed_inc NULL
+ed editeng\source\xml nmake - all ed_xml ed_inc NULL
+ed editeng\source\accessibility nmake - all ed_accessibility ed_inc NULL
+ed editeng\util nmake - all ed_util ed_rtf ed_eeng ed_items ed_outl ed_uno ed_xml ed_accessibility ed_misc NULL
+
diff --git a/editeng/prj/d.lst b/editeng/prj/d.lst
new file mode 100644
index 000000000000..364c1a8fddba
--- /dev/null
+++ b/editeng/prj/d.lst
@@ -0,0 +1,14 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\lib\iediteng.lib %_DEST%\lib%_EXT%\iediteng.lib
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+
+mkdir: %_DEST%\inc%_EXT%\svx
+..\inc\editeng\*.h %_DEST%\inc%_EXT%\editeng\*.h
+..\inc\editeng\*.hrc %_DEST%\inc%_EXT%\editeng\*.hrc
+..\inc\editeng\*.hxx %_DEST%\inc%_EXT%\editeng\*.hxx
+
diff --git a/svx/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index 13e38f5e8687..3a5cd0c0885f 100644
--- a/svx/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
@@ -26,22 +26,19 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <svx/AccessibleComponentBase.hxx>
+#include <editeng/AccessibleComponentBase.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_ROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_SELECTION_HPP_
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#endif
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/drawing/XShapeDescriptor.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+
#include <tools/color.hxx>
using namespace ::rtl;
diff --git a/svx/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 45ed69ff0055..e35626491cf9 100644
--- a/svx/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -26,24 +26,23 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <svx/AccessibleContextBase.hxx>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
-
+#include <editeng/AccessibleContextBase.hxx>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
#include <rtl/uuid.h>
-
#include <vos/mutex.hxx>
-#include <vcl/svapp.hxx>
+//#include <vcl/svapp.hxx>
#include <utility>
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index bdb970da2f11..94b0d92c8d3e 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -26,7 +26,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
//------------------------------------------------------------------------
//
@@ -58,6 +58,10 @@
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
// <--
#include <vcl/unohelp.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unoipset.hxx>
+#include <editeng/outliner.hxx>
//------------------------------------------------------------------------
//
@@ -66,13 +70,9 @@
//------------------------------------------------------------------------
#include <com/sun/star/beans/PropertyState.hpp>
-#include <svx/unoshape.hxx>
-#include "unolingu.hxx"
-#include "unopracc.hxx"
-#include "AccessibleEditableTextPara.hxx"
-#include <svx/dialmgr.hxx>
-
-#include "accessibility.hrc"
+#include <editeng/unolingu.hxx>
+#include <editeng/unopracc.hxx>
+#include "editeng/AccessibleEditableTextPara.hxx"
#include <svtools/colorcfg.hxx>
@@ -102,7 +102,7 @@ namespace accessibility
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{0,0,0,0,0,0}
};
- static SvxItemPropertySet aPropSet( aPropMap );
+ static SvxItemPropertySet aPropSet( aPropMap, EditEngine::GetGlobalItemPool() );
return &aPropSet;
}
diff --git a/svx/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 09c9dc5ddc89..5268e14f974c 100644
--- a/svx/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -26,7 +26,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
#include <tools/gen.hxx>
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -40,15 +40,15 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <comphelper/accessibleeventnotifier.hxx>
#include <unotools/accessiblestatesethelper.hxx>
-#include "unolingu.hxx"
-#include "AccessibleEditableTextPara.hxx"
-#include "AccessibleImageBullet.hxx"
-#include <svx/dialmgr.hxx>
-
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/outliner.hxx>
-#include "accessibility.hrc"
+#include <editeng/unolingu.hxx>
+#include "editeng/AccessibleEditableTextPara.hxx"
+#include "editeng/AccessibleImageBullet.hxx"
+#include <editeng/eerdll.hxx>
+
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/outliner.hxx>
+#include "editeng.hrc"
#include <svtools/colorcfg.hxx>
@@ -170,7 +170,7 @@ namespace accessibility
::vos::OGuard aGuard( Application::GetSolarMutex() );
// Get the string from the resource for the specified id.
- return ::rtl::OUString( SVX_RESSTR (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) );
+ return ::rtl::OUString( String( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) ) );
}
::rtl::OUString SAL_CALL AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException)
@@ -180,7 +180,7 @@ namespace accessibility
::vos::OGuard aGuard( Application::GetSolarMutex() );
// Get the string from the resource for the specified id.
- return ::rtl::OUString( SVX_RESSTR (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) );
+ return ::rtl::OUString( String ( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) ) );
}
uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException)
diff --git a/svx/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index b2f2a76baba4..d31721104aff 100644
--- a/svx/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -26,7 +26,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
//------------------------------------------------------------------------
//
@@ -45,11 +45,11 @@
//
//------------------------------------------------------------------------
-#include "unoedhlp.hxx"
-#include "unopracc.hxx"
-#include <svx/unoedsrc.hxx>
-#include "AccessibleParaManager.hxx"
-#include "AccessibleEditableTextPara.hxx"
+#include <editeng/unoedhlp.hxx>
+#include <editeng/unopracc.hxx>
+#include <editeng/unoedsrc.hxx>
+#include "editeng/AccessibleParaManager.hxx"
+#include "editeng/AccessibleEditableTextPara.hxx"
using namespace ::com::sun::star;
diff --git a/svx/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx
index 68a8992c53ac..73fbb178d28c 100644
--- a/svx/source/accessibility/AccessibleSelectionBase.cxx
+++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx
@@ -26,9 +26,9 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include "AccessibleSelectionBase.hxx"
+#include <editeng/AccessibleSelectionBase.hxx>
using namespace ::rtl;
using namespace ::com::sun::star;
diff --git a/svx/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 1e03d0dedf31..78b3d851900d 100644
--- a/svx/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -26,7 +26,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
//------------------------------------------------------------------------
//
@@ -54,11 +54,11 @@
//
//------------------------------------------------------------------------
-#include <svx/editdata.hxx>
-#include "unopracc.hxx"
-#include "unoedprx.hxx"
-#include "AccessibleStaticTextBase.hxx"
-#include "AccessibleEditableTextPara.hxx"
+#include <editeng/editdata.hxx>
+#include <editeng/unopracc.hxx>
+#include "editeng/unoedprx.hxx"
+#include <editeng/AccessibleStaticTextBase.hxx>
+#include "editeng/AccessibleEditableTextPara.hxx"
using namespace ::com::sun::star;
diff --git a/svx/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx
index da3edfd27173..e52ff3ae4b91 100644
--- a/svx/source/accessibility/AccessibleStringWrap.cxx
+++ b/editeng/source/accessibility/AccessibleStringWrap.cxx
@@ -26,15 +26,14 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
#include <algorithm>
#include <tools/debug.hxx>
#include <vcl/outdev.hxx>
-#include <svx/svxfont.hxx>
-#include "AccessibleStringWrap.hxx"
-
+#include <editeng/svxfont.hxx>
+#include <editeng/AccessibleStringWrap.hxx>
//------------------------------------------------------------------------
//
diff --git a/editeng/source/accessibility/accessibility.src b/editeng/source/accessibility/accessibility.src
new file mode 100644
index 000000000000..430af128e58e
--- /dev/null
+++ b/editeng/source/accessibility/accessibility.src
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: accessibility.src,v $
+ * $Revision: 1.34 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "editeng.hrc"
+
+String RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION
+{
+ Text [ en-US ] = "Image bullet in paragraph" ;
+};
+
+String RID_SVXSTR_A11Y_IMAGEBULLET_NAME
+{
+ Text [ en-US ] = "Image bullet" ;
+};
+
+
diff --git a/editeng/source/accessibility/makefile.mk b/editeng/source/accessibility/makefile.mk
new file mode 100755
index 000000000000..e29b6477f608
--- /dev/null
+++ b/editeng/source/accessibility/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.25 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=editeng
+TARGET=accessibility
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+
+SLOFILES = \
+ $(SLO)$/AccessibleStringWrap.obj \
+ $(SLO)$/AccessibleContextBase.obj \
+ $(SLO)$/AccessibleComponentBase.obj \
+ $(SLO)$/AccessibleSelectionBase.obj \
+ $(SLO)$/AccessibleStaticTextBase.obj \
+ $(SLO)$/AccessibleParaManager.obj \
+ $(SLO)$/AccessibleEditableTextPara.obj \
+ $(SLO)$/AccessibleImageBullet.obj
+
+# --- Tagets -------------------------------------------------------
+
+.INCLUDE : target.mk
+
diff --git a/svx/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index b58e83cad378..a1d4a66b8fb1 100644
--- a/svx/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -26,33 +26,36 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
-
-#include <svx/svxfont.hxx>
-#include <svx/flditem.hxx>
-#include <fontitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-
-
-#include <editattr.hxx>
+#include "precompiled_editeng.hxx"
+
+//#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
+
+#include <editeng/svxfont.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+
+#include "editattr.hxx"
DBG_NAME( EE_EditAttrib )
diff --git a/svx/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 71cf5991c78f..9f07969ee74d 100644
--- a/svx/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -28,7 +28,7 @@
#ifndef _EDITATTR_HXX
#define _EDITATTR_HXX
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
class SvxFont;
class SvxFontItem;
diff --git a/svx/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 20e69af641a1..01a387249f24 100644
--- a/svx/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -26,43 +26,41 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <eeng_pch.hxx>
-
-#ifndef _MSGBOX_HXX //autogen
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
#include <vcl/msgbox.hxx>
-#endif
-
-#include <svx/lspcitem.hxx>
-
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <fontitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/numitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/frmdiritem.hxx>
+#include <vcl/svapp.hxx>
+
+#include <editeng/lspcitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/frmdiritem.hxx>
#include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
#include <editdoc.hxx>
#include <editdbg.hxx>
diff --git a/svx/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx
index 96b2811e144b..efe3248e9af4 100644
--- a/svx/source/editeng/editdbg.hxx
+++ b/editeng/source/editeng/editdbg.hxx
@@ -43,7 +43,7 @@ class SfxPoolItem;
ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem );
void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL bShowALL );
-class SVX_DLLPUBLIC EditDbg
+class EditDbg
{
public:
static void ShowEditEngineData( EditEngine* pEditEngine, BOOL bInfoBox = TRUE );
diff --git a/svx/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index c7c742180c30..9ac179a2a47f 100644
--- a/svx/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -26,45 +26,44 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
-
-#include <svx/tstpitem.hxx>
-#include <svx/colritem.hxx>
-#include <fontitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <xmlcnitm.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
+
+#include <editeng/tstpitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/xmlcnitm.hxx>
+#include <editeng/editids.hrc>
#include <editdoc.hxx>
#include <editdbg.hxx>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
#include <eerdll2.hxx>
#include <tools/stream.hxx>
-
#include <tools/debug.hxx>
#include <tools/shl.hxx>
#include <vcl/svapp.hxx>
-
-#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HPP_
#include <com/sun/star/i18n/ScriptType.hpp>
-#endif
-
#include <stdlib.h> // qsort
using namespace ::com::sun::star;
diff --git a/svx/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 6856213a4446..bf2e3d01852b 100644
--- a/svx/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -34,7 +34,7 @@
#include <editattr.hxx>
#include <edtspell.hxx>
-#include <svx/svxfont.hxx>
+#include <editeng/svxfont.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
#include <svl/itempool.hxx>
diff --git a/svx/source/editeng/editdoc2.cxx b/editeng/source/editeng/editdoc2.cxx
index 82f4ae0024ee..b2a83ffd6274 100644
--- a/svx/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -26,37 +26,41 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
#include <svl/smplhint.hxx>
+
#include <tools/rtti.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
#include <editdoc.hxx>
#include <impedit.hxx>
#include <editdbg.hxx>
-#include <svx/numitem.hxx>
-
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/charscaleitem.hxx>
+#include <editeng/numitem.hxx>
+
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/charscaleitem.hxx>
#include <vcl/svapp.hxx> // Fuer AppWindow...
diff --git a/svx/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 065eadd82d28..212fb8ff9446 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -26,10 +26,13 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
-// #define _SOLAR__PRIVATE 1
#define USE_SVXFONT
#define _SVSTDARR_USHORTS
@@ -37,58 +40,56 @@
#include <svl/ctloptions.hxx>
#include <svtools/ctrltool.hxx>
-#include <svx/svxfont.hxx>
+#include <editeng/svxfont.hxx>
#include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <editstat.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editstat.hxx>
#include <editdbg.hxx>
#include <eerdll2.hxx>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
#include <editeng.hrc>
-#include <svx/flditem.hxx>
-#include <txtrange.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/txtrange.hxx>
#include <vcl/graph.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
-#include <svx/numitem.hxx>
-#include <bulitem.hxx>
-#include <unolingu.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/unolingu.hxx>
#include <linguistic/lngprops.hxx>
-#include <sfx2/sfxuno.hxx>
#include <i18npool/mslangid.hxx>
#include <vcl/help.hxx>
-#include <svx/xpoly.hxx>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
-#include <sfx2/srchdefs.hxx>
+#include <svl/srchdefs.hxx>
#if OSL_DEBUG_LEVEL > 1
-#include <svx/frmdiritem.hxx>
+#include <editeng/frmdiritem.hxx>
#endif
#include <basegfx/polygon/b2dpolygon.hxx>
@@ -108,6 +109,7 @@ static sal_Bool bDebugPaint = sal_False;
SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
+static SfxItemPool* pGlobalPool=0;
// ----------------------------------------------------------------------
// EditEngine
@@ -1143,9 +1145,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
pEditView->pImpEditView->DrawSelection();
// Autokorrektur ?
if ( ( pImpEditEngine->GetStatus().DoAutoCorrect() ) &&
- ( ( nCharCode == ' ' ) || ( nCharCode == '*' ) ||
- ( nCharCode == '\"' ) || ( nCharCode == '\'' ) ||
- ( nCharCode == '_' ) ))
+ SvxAutoCorrect::IsAutoCorrectChar( nCharCode ) )
{
aCurSel = pImpEditEngine->AutoCorrect( aCurSel, nCharCode, !pEditView->IsInsertMode() );
}
@@ -2617,6 +2617,13 @@ SfxItemPool* EditEngine::CreatePool( sal_Bool bPersistentRefCounts )
return pPool;
}
+SfxItemPool& EditEngine::GetGlobalItemPool()
+{
+ if ( !pGlobalPool )
+ pGlobalPool = CreatePool();
+ return *pGlobalPool;
+}
+
sal_uInt32 EditEngine::RegisterClipboardFormatName()
{
static sal_uInt32 nFormat = 0;
diff --git a/svx/source/editeng/editeng.src b/editeng/source/editeng/editeng.src
index b65f20c36583..b65f20c36583 100644
--- a/svx/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.src
diff --git a/svx/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 2ddd49a3b01a..7cd009cc52be 100644
--- a/svx/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -26,26 +26,28 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
#define ENABLE_STRING_STREAM_OPERATORS
#include <tools/stream.hxx>
#include <editobj2.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
#include <editattr.hxx>
-#include <svx/editeng.hxx>
-#include <fontitem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <bulitem.hxx>
-#include <svx/numitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/brshitem.hxx>
#include <vcl/graph.hxx>
#include <svl/intitem.hxx>
#include <unotools/fontcvt.hxx>
diff --git a/svx/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 3d7119472bd8..6ef3ce359d49 100644
--- a/svx/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -28,7 +28,7 @@
#ifndef _EDITOBJ2_HXX
#define _EDITOBJ2_HXX
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
#include <editdoc.hxx>
#include <unotools/fontcvt.hxx>
diff --git a/svx/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 9e1f38915e19..3ea9e9b3e290 100644
--- a/svx/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -26,13 +26,13 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
#include <eeng_pch.hxx>
#include <editsel.hxx>
#include <impedit.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
// ----------------------------------------------------------------------
// class EditSelFunctionSet
diff --git a/svx/source/editeng/editsel.hxx b/editeng/source/editeng/editsel.hxx
index e4d5b9d71b05..e4d5b9d71b05 100644
--- a/svx/source/editeng/editsel.hxx
+++ b/editeng/source/editeng/editsel.hxx
diff --git a/svx/source/editeng/editstt2.hxx b/editeng/source/editeng/editstt2.hxx
index 85bc368aa35a..40c53634b5ce 100644
--- a/svx/source/editeng/editstt2.hxx
+++ b/editeng/source/editeng/editstt2.hxx
@@ -28,7 +28,7 @@
#ifndef _EDITSTT2_HXX
#define _EDITSTT2_HXX
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
class InternalEditStatus : public EditStatus
{
diff --git a/svx/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index ffcd490aa77b..054971c240fd 100644
--- a/svx/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -26,14 +26,14 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
#include <eeng_pch.hxx>
#include <impedit.hxx>
#include <editundo.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
DBG_NAME( EditUndo )
diff --git a/svx/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 631fcc11f259..4c54c553c353 100644
--- a/svx/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -29,8 +29,8 @@
#define _EDITUNDO_HXX
#include <editdoc.hxx>
-#include <editund2.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editund2.hxx>
+#include <editeng/editdata.hxx>
#define UNDO_NOACTION 0
#define UNDO_NEWUNDO 1
diff --git a/svx/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index aad54cc16971..766023a0038c 100644
--- a/svx/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -26,52 +26,51 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
#include <com/sun/star/i18n/WordType.hpp>
#include <vcl/metric.hxx>
-#define _SOLAR__PRIVATE 1
-
#include <i18npool/mslangid.hxx>
#include <svl/languageoptions.hxx>
#include <svtools/ctrltool.hxx>
+#include <svtools/langtab.hxx>
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <svx/flditem.hxx>
-#include <svx/svxacorr.hxx>
-#include <svx/langitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <eerdll.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/svxacorr.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/eerdll.hxx>
#include <eerdll2.hxx>
#include <editeng.hrc>
-#include <dlgutil.hxx>
#include <helpid.hrc>
#include <i18npool/lang.h>
#include <vcl/menu.hxx>
-#include <acorrcfg.hxx>
-#include <unolingu.hxx>
-#include <fontitem.hxx>
+#include <editeng/acorrcfg.hxx>
+#include <editeng/unolingu.hxx>
+#include <editeng/fontitem.hxx>
#include <com/sun/star/frame/XStorable.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_HDL_
#include <com/sun/star/beans/PropertyValues.hdl>
-#endif
#include <com/sun/star/lang/Locale.hpp>
#include <linguistic/lngprops.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <unotools/lingucfg.hxx>
-
using ::rtl::OUString;
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -1077,8 +1076,8 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
nGuessLangPara = nGuessLangWord;
aPopupMenu.InsertSeparator();
- String aTmpWord( ::GetLanguageString( nGuessLangWord ) );
- String aTmpPara( ::GetLanguageString( nGuessLangPara ) );
+ String aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) );
+ String aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) );
String aWordStr( EditResId( RID_STR_WORD ) );
aWordStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpWord );
String aParaStr( EditResId( RID_STR_PARAGRAPH ) );
diff --git a/svx/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index e3a816ea27fa..fed1394e5fd0 100644
--- a/svx/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -26,19 +26,22 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
#include <impedit.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
#include <edtspell.hxx>
-#include <svx/flditem.hxx>
-#include <fontitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/fontitem.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
#include <linguistic/lngprops.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svx/inc/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index a36975d83c96..cfe0aaf57e87 100644
--- a/svx/inc/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -28,12 +28,12 @@
#ifndef _EDTSPELL_HXX
#define _EDTSPELL_HXX
-#include <svx/svxbox.hxx>
-#include <svx/svxenum.hxx>
-#include <svx/splwrap.hxx>
-#include <svx/svxacorr.hxx>
+#include <svtools/svxbox.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/splwrap.hxx>
+#include <editeng/svxacorr.hxx>
#include <com/sun/star/uno/Reference.h>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
namespace com { namespace sun { namespace star { namespace linguistic2 {
class XSpellChecker1;
@@ -145,7 +145,7 @@ inline void WrongList::InsertWrong( const WrongRange& rWrong, USHORT nPos )
-class SVX_DLLPUBLIC EdtAutoCorrDoc : public SvxAutoCorrDoc
+class EdtAutoCorrDoc : public SvxAutoCorrDoc
{
ImpEditEngine* pImpEE;
ContentNode* pCurNode;
diff --git a/svx/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index e99f25804959..ddb82a06661d 100644
--- a/svx/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -26,19 +26,21 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
#include <eehtml.hxx>
#include <impedit.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/flditem.hxx>
#include <tools/urlobj.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
#include <svtools/htmltokn.h>
#include <svtools/htmlkywd.hxx>
@@ -49,7 +51,7 @@
#define STYLE_PRE 101
EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs )
- : SfxHTMLParser( rIn, true )
+ : HTMLParser( rIn, true )
, aBaseURL( rBaseURL )
{
pImpEditEngine = 0;
diff --git a/svx/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index 9756d0fc17c4..a9b20bcd652f 100644
--- a/svx/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -31,7 +31,7 @@
#include <svl/svarray.hxx>
#include <editdoc.hxx>
-#include <sfx2/sfxhtml.hxx>
+#include <svtools/parhtml.hxx>
class ImpEditEngine;
@@ -43,9 +43,7 @@ struct AnchorInfo
String aText;
};
-#ifndef SVX_LIGHT
-
-class EditHTMLParser : public SfxHTMLParser
+class EditHTMLParser : public HTMLParser
{
using HTMLParser::CallParser;
private:
@@ -97,6 +95,4 @@ public:
SV_DECL_REF( EditHTMLParser )
SV_IMPL_REF( EditHTMLParser );
-#endif
-
#endif // _EEHTML_HXX
diff --git a/svx/source/editeng/eeng_pch.cxx b/editeng/source/editeng/eeng_pch.cxx
index f86dffb1fd07..249f4cb0ab12 100644
--- a/svx/source/editeng/eeng_pch.cxx
+++ b/editeng/source/editeng/eeng_pch.cxx
@@ -26,5 +26,5 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
#include <eeng_pch.hxx>
diff --git a/svx/source/editeng/eeng_pch.hxx b/editeng/source/editeng/eeng_pch.hxx
index 18c170d975a4..14c8b9f5dc4b 100644
--- a/svx/source/editeng/eeng_pch.hxx
+++ b/editeng/source/editeng/eeng_pch.hxx
@@ -31,10 +31,4 @@
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
-
-#ifndef SVX_LIGHT
-#include <svx/thesdlg.hxx>
-#endif
diff --git a/svx/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 62f311fb258a..a275f8b5d372 100644
--- a/svx/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -26,7 +26,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
#include <eeng_pch.hxx>
@@ -34,7 +34,7 @@
#include <eeobj.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
#include <svl/itempool.hxx>
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index 6a4956b2481a..6a4956b2481a 100644
--- a/svx/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
diff --git a/svx/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 86e17725c23d..7d6df3f0fab4 100644
--- a/svx/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -26,52 +26,53 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <svl/solar.hrc>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
#include <eerdll2.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <bulitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/scriptspaceitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
#include <svl/itempool.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <fontitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/numitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <xmlcnitm.hxx>
-
-#include <forbiddencharacterstable.hxx>
-
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/xmlcnitm.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
#include <comphelper/processfactory.hxx>
static EditDLL* pDLL=0;
@@ -224,7 +225,7 @@ EditResId::EditResId( USHORT nId ):
EditDLL::EditDLL()
{
pGlobalData = new GlobalEditData;
- ByteString aResMgrName( "svx" );
+ ByteString aResMgrName( "editeng" );
pResMgr = ResMgr::CreateResMgr(
aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
}
diff --git a/svx/source/editeng/eerdll2.hxx b/editeng/source/editeng/eerdll2.hxx
index f2d08fed945b..49bfa058038e 100644
--- a/svx/source/editeng/eerdll2.hxx
+++ b/editeng/source/editeng/eerdll2.hxx
@@ -29,8 +29,7 @@
#define _EERDLL2_HXX
#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
-
-#include <forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
#include <vos/ref.hxx>
class SfxPoolItem;
diff --git a/svx/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 0b525df4f04e..9f919afb39d6 100644
--- a/svx/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -26,17 +26,20 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
#include <eertfpar.hxx>
#include <impedit.hxx>
#include <svl/intitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/flditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/flditem.hxx>
#include <svtools/rtftoken.h>
diff --git a/svx/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index f41be863895d..42c75b811f33 100644
--- a/svx/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -27,7 +27,7 @@
#ifndef _EERTFPAR_HXX
#define _EERTFPAR_HXX
-#include <svxrtf.hxx>
+#include <editeng/svxrtf.hxx>
#include <editdoc.hxx>
#include <impedit.hxx>
diff --git a/svx/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 8e7bc4831e1d..b327d2a685bd 100644
--- a/svx/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -26,37 +26,30 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
#include <eeng_pch.hxx>
#include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
#include <tools/poly.hxx>
-#include <unolingu.hxx>
-#include <sfx2/sfxuno.hxx>
+#include <editeng/unolingu.hxx>
#include <com/sun/star/linguistic2/XDictionaryEntry.hpp>
#include <com/sun/star/linguistic2/DictionaryType.hpp>
#include <com/sun/star/linguistic2/DictionaryEvent.hpp>
#include <com/sun/star/linguistic2/XDictionaryEventListener.hpp>
#include <com/sun/star/linguistic2/DictionaryEventFlags.hpp>
#include <com/sun/star/linguistic2/XDictionary.hpp>
-
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DNDCONSTANS_HPP_
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
-#endif
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
-
#include <vos/mutex.hxx>
-
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
#include <svl/intitem.hxx>
#include <svtools/transfer.hxx>
-
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
diff --git a/svx/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index c484023d0cb3..3bacfc949e3b 100644
--- a/svx/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -32,8 +32,8 @@
#include <editundo.hxx>
#include <editobj2.hxx>
#include <editstt2.hxx>
-#include <svx/editdata.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/svxacorr.hxx>
#include <vcl/virdev.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/cursor.hxx>
@@ -49,17 +49,10 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
-
-#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_
#include <com/sun/star/i18n/WordType.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_
#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-#endif
#include <i18npool/lang.h>
-
#include <vos/ref.hxx>
DBG_NAMEEX( EditView )
@@ -98,9 +91,9 @@ class TextRanger;
class SvKeyValueIterator;
class SvxForbiddenCharactersTable;
class SvtCTLOptions;
-#include <svx/SpellPortions.hxx>
+#include <editeng/SpellPortions.hxx>
-#include <svx/eedata.hxx>
+#include <editeng/eedata.hxx>
class SvUShorts;
class SvxNumberFormat;
diff --git a/svx/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 1cf22f04e72f..bbdfa47e6a57 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -26,46 +26,40 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/flditem.hxx>
#include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
#include <editdbg.hxx>
#include <eerdll2.hxx>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
#include <edtspell.hxx>
#include <eeobj.hxx>
-#include <txtrange.hxx>
+#include <editeng/txtrange.hxx>
#include <svl/urlbmk.hxx>
#include <svtools/colorcfg.hxx>
#include <svl/ctloptions.hxx>
-#include <acorrcfg.hxx>
-
-#include <svx/fhgtitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <fontitem.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <sfx2/dispatch.hxx>
+#include <editeng/acorrcfg.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/fontitem.hxx>
#include <vcl/cmdevt.h>
-#ifndef SVX_LIGHT
-#ifndef _SFXFRAME_HXX //autogen
-#include <sfx2/frame.hxx>
-#endif
-#endif
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/svx/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 91ee6a323553..dbc6767d1f91 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -26,56 +26,53 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/metaact.hxx>
#include <vcl/gdimtf.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
-#ifndef _WRKWIN_HXX //autogen
#include <vcl/wrkwin.hxx>
-#endif
-
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/lspcitem.hxx>
-
-#include <svx/flditem.hxx>
-
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/flditem.hxx>
#include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <txtrange.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <fontitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/scriptspaceitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/numitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/txtrange.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/numitem.hxx>
#include <svtools/colorcfg.hxx>
#include <svl/ctloptions.hxx>
-#include <forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
#include <unotools/localedatawrapper.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
#include <math.h>
#include <vcl/svapp.hxx>
-#include <sfx2/sfxuno.hxx>
#include <vcl/metric.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/text/CharacterCompressionType.hpp>
diff --git a/svx/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index e98f4b21d6ac..c45c6faf2b6a 100644
--- a/svx/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -26,74 +26,62 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <eeng_pch.hxx>
-
-#ifndef _MSGBOX_HXX //autogen
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
#include <vcl/msgbox.hxx>
-#endif
#include <vcl/svapp.hxx>
-#include <sfx2/srchitem.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
+#include <svl/srchitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
#include <eertfpar.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
#include <impedit.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
#include <eehtml.hxx>
#include <editobj2.hxx>
#include <i18npool/lang.h>
-#include <editxml.hxx>
-
-
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/emphitem.hxx>
+#include "editxml.hxx"
+
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/emphitem.hxx>
#include <textconv.hxx>
-
#include <rtl/tencinfo.h>
-
#include <svtools/rtfout.hxx>
-
-#ifndef SVX_LIGHT
#include <edtspell.hxx>
-#endif
-#include <svx/scripttypeitem.hxx>
-#include <unolingu.hxx>
-#include <sfx2/sfxuno.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/unolingu.hxx>
#include <linguistic/lngprops.hxx>
#include <com/sun/star/linguistic2/XThesaurus.hpp>
#include <com/sun/star/linguistic2/XMeaning.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <unotools/transliterationwrapper.hxx>
-
-#ifndef _TXTCMP_HXX //autogen
#include <unotools/textsearch.hxx>
-#endif
#include <comphelper/processfactory.hxx>
#include <vcl/help.hxx>
-
#include <svtools/rtfkeywd.hxx>
+#include <editeng/edtdlg.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1547,8 +1535,8 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
lang::Locale aLocale( SvxCreateLocale( nLangFound ) );
#endif
bHasConvTxt = (nSrcLang == nLangFound) ||
- (svx::HangulHanjaConversion::IsChinese( nLangFound ) &&
- svx::HangulHanjaConversion::IsChinese( nSrcLang ));
+ (editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
+ editeng::HangulHanjaConversion::IsChinese( nSrcLang ));
if (bHasConvTxt)
return bHasConvTxt;
}
@@ -1597,7 +1585,7 @@ void ImpEditEngine::Convert( EditView* pEditView,
// not work. Thus since chinese conversion is not interactive we start
// at the begin of the paragraph to solve the problem, i.e. have the
// TextConversion service get those characters together in the same call.
- USHORT nStartIdx = ( svx::HangulHanjaConversion::IsChinese( nSrcLang ) ) ?
+ USHORT nStartIdx = ( editeng::HangulHanjaConversion::IsChinese( nSrcLang ) ) ?
0 : aWordStartPaM.GetIndex();
pConvInfo->aConvStart.nIndex = nStartIdx;
}
@@ -1761,8 +1749,8 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
lang::Locale aLocale( SvxCreateLocale( nLangFound ) );
#endif
sal_Bool bLangOk = (nLangFound == nSrcLang) ||
- (svx::HangulHanjaConversion::IsChinese( nLangFound ) &&
- svx::HangulHanjaConversion::IsChinese( nSrcLang ));
+ (editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
+ editeng::HangulHanjaConversion::IsChinese( nSrcLang ));
if (nAttribEnd != USHRT_MAX) // start already found?
{
@@ -2560,18 +2548,19 @@ EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView )
if (!xThes.is())
return EE_SPELL_ERRORFOUND;
- SvxThesaurusDialog aDialog( pEditView->GetWindow(), xThes, aWord, GetLanguage( aCurSel.Max() ) );
-
- if ( aDialog.Execute() == RET_OK )
+ EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
+ AbstractThesaurusDialog* pDlg = pFact->CreateThesaurusDialog( pEditView->GetWindow(), xThes, aWord, GetLanguage( aCurSel.Max() ) );
+ if ( pDlg->Execute() == RET_OK )
{
// Wort ersetzen...
pEditView->pImpEditView->DrawSelection();
pEditView->pImpEditView->SetEditSelection( aCurSel );
pEditView->pImpEditView->DrawSelection();
- pEditView->InsertText( aDialog.GetWord() );
+ pEditView->InsertText( pDlg->GetWord() );
pEditView->ShowCursor( sal_True, sal_False );
}
+ delete pDlg;
return EE_SPELL_OK;
#else
return EE_SPELL_NOSPELLER;
diff --git a/svx/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 9e7775ecb01b..2efbb60b6c0f 100644
--- a/svx/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -26,18 +26,18 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
#include <eeng_pch.hxx>
#include <impedit.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
#include <editdbg.hxx>
#include <svl/smplhint.hxx>
-#include <svx/lrspitem.hxx>
+#include <editeng/lrspitem.hxx>
void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
{
diff --git a/svx/source/editeng/makefile.mk b/editeng/source/editeng/makefile.mk
index 963df5c6775b..4a8f8f254070 100644
--- a/svx/source/editeng/makefile.mk
+++ b/editeng/source/editeng/makefile.mk
@@ -26,13 +26,13 @@
#*************************************************************************
PRJ=..$/..
-PRJNAME=svx
+PRJNAME=editeng
TARGET=editeng
AUTOSEG=true
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=eeng_pch
-PROJECTPCHSOURCE=eeng_pch
+#PROJECTPCH4DLL=TRUE
+#PROJECTPCH=eeng_pch
+#PROJECTPCHSOURCE=eeng_pch
ENABLE_EXCEPTIONS=TRUE
@@ -49,13 +49,7 @@ CDEFS+=-DEDITDEBUG
.ENDIF
SLOFILES = \
- $(SLO)$/svxacorr.obj \
- $(SLO)$/acorrcfg.obj \
- $(SLO)$/txtrange.obj \
- $(SLO)$/SvXMLAutoCorrectImport.obj \
- $(SLO)$/SvXMLAutoCorrectExport.obj \
- $(SLO)$/forbiddencharacterstable.obj \
- $(SLO)$/swafopt.obj \
+ $(SLO)$/textconv.obj \
$(SLO)$/editattr.obj \
$(SLO)$/editdbg.obj \
$(SLO)$/editdoc.obj \
@@ -74,9 +68,7 @@ SLOFILES = \
$(SLO)$/impedit2.obj \
$(SLO)$/impedit3.obj \
$(SLO)$/impedit4.obj \
- $(SLO)$/impedit5.obj \
- $(SLO)$/textconv.obj \
- $(SLO)$/unolingu.obj
+ $(SLO)$/impedit5.obj
SRS1NAME=$(TARGET)
SRC1FILES= editeng.src
diff --git a/svx/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 20ef7ae3c4de..e46a40f09e02 100644
--- a/svx/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -26,18 +26,22 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
#include <impedit.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
-#include <unolingu.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/unolingu.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/Locale.hpp>
-#include <svx/langitem.hxx>
-#include <fontitem.hxx>
-#include "textconv.hxx"
+#include <editeng/langitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <textconv.hxx>
using ::rtl::OUString;
diff --git a/svx/inc/textconv.hxx b/editeng/source/editeng/textconv.hxx
index aadd9a50e588..8ffc00291fe9 100644
--- a/svx/inc/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -27,17 +27,17 @@
#ifndef _TEXTCONV_HXX
#define _TEXTCONV_HXX
-#include <svx/splwrap.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/splwrap.hxx>
+#include <editeng/svxacorr.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx>
-#include <svx/hangulhanja.hxx>
+#include <editeng/hangulhanja.hxx>
class EditView;
class ImpEditEngine;
class ContentNode;
-class TextConvWrapper : public svx::HangulHanjaConversion
+class TextConvWrapper : public editeng::HangulHanjaConversion
{
rtl::OUString aConvText; // convertible text part found last time
LanguageType nConvTextLang; // language of aConvText
diff --git a/svx/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 4e4f62722fb1..bd572b059a69 100644
--- a/svx/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -26,17 +26,16 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
// include ---------------------------------------------------------------
#include <tools/stream.hxx>
-
#include <vcl/outdev.hxx>
#define _SVX_BULITEM_CXX
-#include "bulitem.hxx"
-#include "svxerr.hxx"
+#include <editeng/bulitem.hxx>
+#include <editeng/editrids.hrc>
// #90477#
#include <tools/tenccvt.hxx>
diff --git a/svx/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index fdc74fae7e6d..16b6a23111b2 100644
--- a/svx/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -26,12 +26,12 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
-#include <charhiddenitem.hxx>
-#include <svx/svxitems.hrc>
-#include <svx/dialmgr.hxx>
+#include <editeng/charhiddenitem.hxx>
+#include <editeng/editrids.hrc>
+#include <editeng/eerdll.hxx>
TYPEINIT1_FACTORY(SvxCharHiddenItem, SfxBoolItem, new SvxCharHiddenItem(sal_False, 0));
@@ -72,7 +72,7 @@ SfxItemPresentation SvxCharHiddenItem::GetPresentation
if ( GetValue() )
nId = RID_SVXITEMS_CHARHIDDEN_TRUE;
- rText = SVX_RESSTR(nId);
+ rText = EE_RESSTR(nId);
return ePres;
}
default: ; //prevent warning
diff --git a/svx/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index fe75b7e654c4..5cb45144abab 100644
--- a/svx/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -26,7 +26,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
#include <vcl/metaact.hxx>
#include <svl/zforlist.hxx>
#include <tools/urlobj.hxx>
@@ -34,9 +34,9 @@
#define _SVX_FLDITEM_CXX
#include <unotools/localfilehelper.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
-#include <svx/svdfield.hxx>
+#include <editeng/measfld.hxx>
// #90477#
#include <tools/tenccvt.hxx>
diff --git a/svx/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index bc2dcc4ef428..5840b54a640e 100644
--- a/svx/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -26,62 +26,12 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
// include ---------------------------------------------------------------
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/script/XTypeConverter.hpp>
-
-#include <limits.h>
-#include <comphelper/processfactory.hxx>
-
-
-#include <goodies/grfmgr.hxx>
-#include <tools/urlobj.hxx>
-#ifndef SVX_LIGHT
-#ifndef _SFXDOCFILE_HXX //autogen
-#include <sfx2/docfile.hxx>
-#endif
-#include <sfx2/objsh.hxx>
-#endif // !SVX_LIGHT
-#include <basic/sbx.hxx>
-#define GLOBALOVERFLOW3
-
-#define _SVX_FRMITEMS_CXX
-
-#include <svl/memberid.hrc>
-#include <svtools/wallitem.hxx>
-#include <svl/cntwall.hxx>
-
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-
-#include <svx/impgrf.hxx>
-#include <svx/svxids.hrc>
-#include <svx/svxitems.hrc>
-#include <svx/dialogs.hrc>
-
-#include <svx/pbinitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include "prntitem.hxx"
-#include "opaqitem.hxx"
-#include "protitem.hxx"
-#include <svx/shaditem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brkitem.hxx>
-#include <svx/keepitem.hxx>
-#include "bolnitem.hxx"
-#include <svx/brshitem.hxx>
-//CHINA001 #include "backgrnd.hxx"
-#include <svx/frmdiritem.hxx>
-
-#include <svx/itemtype.hxx>
-#include <svx/dialmgr.hxx>
-#include "svxerr.hxx"
-#include <svx/unoprnms.hxx>
-#include <com/sun/star/table/BorderLine.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/table/CellVertJustify.hpp>
#include <com/sun/star/table/ShadowLocation.hpp>
#include <com/sun/star/table/TableBorder.hpp>
@@ -103,8 +53,44 @@
#include <com/sun/star/text/WritingMode2.hpp>
#include <com/sun/star/frame/status/UpperLowerMarginScale.hpp>
+#include <unotools/ucbstreamhelper.hxx>
+#include <limits.h>
+#include <comphelper/processfactory.hxx>
+#include <svtools/grfmgr.hxx>
+#include <tools/urlobj.hxx>
#include <comphelper/types.hxx>
-#include <svx/unomid.hxx>
+#include <svl/memberid.hrc>
+#include <svtools/wallitem.hxx>
+#include <svl/cntwall.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <svtools/filter.hxx>
+
+#define GLOBALOVERFLOW3
+
+#define _SVX_FRMITEMS_CXX
+
+#include <editeng/editids.hrc>
+#include <editeng/editrids.hrc>
+#include <editeng/pbinitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/prntitem.hxx>
+#include <editeng/opaqitem.hxx>
+#include <editeng/protitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brkitem.hxx>
+#include <editeng/keepitem.hxx>
+#include <editeng/bolnitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/itemtype.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/memberids.hrc>
+#include <editeng/editerr.hxx>
using namespace ::rtl;
using namespace ::com::sun::star;
@@ -190,7 +176,6 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
XubString& rText, const IntlWrapper *
) const
{
-#ifndef SVX_LIGHT
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
@@ -206,10 +191,10 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
BYTE nValue = GetValue();
if ( PAPERBIN_PRINTER_SETTINGS == nValue )
- rText = SVX_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
+ rText = EE_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
else
{
- rText = SVX_RESSTR(RID_SVXSTR_PAPERBIN);
+ rText = EE_RESSTR(RID_SVXSTR_PAPERBIN);
rText += sal_Unicode(' ');
rText += String::CreateFromInt32( nValue );
}
@@ -218,7 +203,7 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
//no break necessary
default: ;//prevent warning
}
-#endif // !SVX_LIGHT
+
return SFX_ITEM_PRESENTATION_NONE;
}
@@ -353,13 +338,13 @@ SfxItemPresentation SvxSizeItem::GetPresentation
return SFX_ITEM_PRESENTATION_NAMELESS;
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = SVX_RESSTR(RID_SVXITEMS_SIZE_WIDTH);
+ rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH);
rText += GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl );
- rText += SVX_RESSTR(GetMetricId(ePresUnit));
+ rText += EE_RESSTR(GetMetricId(ePresUnit));
rText += cpDelim;
- rText += SVX_RESSTR(RID_SVXITEMS_SIZE_HEIGHT);
+ rText += EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT);
rText += GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl );
- rText += SVX_RESSTR(GetMetricId(ePresUnit));
+ rText += EE_RESSTR(GetMetricId(ePresUnit));
return SFX_ITEM_PRESENTATION_COMPLETE;
//no break necessary
default: ;//prevent warning
@@ -621,19 +606,19 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
}
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- rText = SVX_RESSTR(RID_SVXITEMS_LRSPACE_LEFT);
+ rText = EE_RESSTR(RID_SVXITEMS_LRSPACE_LEFT);
if ( 100 != nPropLeftMargin )
( rText += String::CreateFromInt32( nPropLeftMargin )) += sal_Unicode('%');
else
{
rText += GetMetricText( (long)nLeftMargin,
eCoreUnit, ePresUnit, pIntl );
- rText += SVX_RESSTR(GetMetricId(ePresUnit));
+ rText += EE_RESSTR(GetMetricId(ePresUnit));
}
rText += cpDelim;
if ( 100 != nPropFirstLineOfst || nFirstLineOfst )
{
- rText += SVX_RESSTR(RID_SVXITEMS_LRSPACE_FLINE);
+ rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_FLINE);
if ( 100 != nPropFirstLineOfst )
( rText += String::CreateFromInt32( nPropFirstLineOfst ))
+= sal_Unicode('%');
@@ -641,18 +626,18 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
{
rText += GetMetricText( (long)nFirstLineOfst,
eCoreUnit, ePresUnit, pIntl );
- rText += SVX_RESSTR(GetMetricId(ePresUnit));
+ rText += EE_RESSTR(GetMetricId(ePresUnit));
}
rText += cpDelim;
}
- rText += SVX_RESSTR(RID_SVXITEMS_LRSPACE_RIGHT);
+ rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_RIGHT);
if ( 100 != nPropRightMargin )
( rText += String::CreateFromInt32( nPropRightMargin )) += sal_Unicode('%');
else
{
rText += GetMetricText( (long)nRightMargin,
eCoreUnit, ePresUnit, pIntl );
- rText += SVX_RESSTR(GetMetricId(ePresUnit));
+ rText += EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
@@ -971,22 +956,22 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
}
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- rText = SVX_RESSTR(RID_SVXITEMS_ULSPACE_UPPER);
+ rText = EE_RESSTR(RID_SVXITEMS_ULSPACE_UPPER);
if ( 100 != nPropUpper )
( rText += String::CreateFromInt32( nPropUpper )) += sal_Unicode('%');
else
{
rText += GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl );
- rText += SVX_RESSTR(GetMetricId(ePresUnit));
+ rText += EE_RESSTR(GetMetricId(ePresUnit));
}
rText += cpDelim;
- rText += SVX_RESSTR(RID_SVXITEMS_ULSPACE_LOWER);
+ rText += EE_RESSTR(RID_SVXITEMS_ULSPACE_LOWER);
if ( 100 != nPropLower )
( rText += String::CreateFromInt32( nPropLower )) += sal_Unicode('%');
else
{
rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl );
- rText += SVX_RESSTR(GetMetricId(ePresUnit));
+ rText += EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
@@ -1103,7 +1088,7 @@ SfxItemPresentation SvxPrintItem::GetPresentation
if ( GetValue() )
nId = RID_SVXITEMS_PRINT_TRUE;
- rText = SVX_RESSTR(nId);
+ rText = EE_RESSTR(nId);
return ePres;
}
default: ;//prevent warning
@@ -1160,7 +1145,7 @@ SfxItemPresentation SvxOpaqueItem::GetPresentation
if ( GetValue() )
nId = RID_SVXITEMS_OPAQUE_TRUE;
- rText = SVX_RESSTR(nId);
+ rText = EE_RESSTR(nId);
return ePres;
}
default: ;//prevent warning
@@ -1251,19 +1236,19 @@ SfxItemPresentation SvxProtectItem::GetPresentation
if ( bCntnt )
nId = RID_SVXITEMS_PROT_CONTENT_TRUE;
- rText = SVX_RESSTR(nId);
+ rText = EE_RESSTR(nId);
rText += cpDelim;
nId = RID_SVXITEMS_PROT_SIZE_FALSE;
if ( bSize )
nId = RID_SVXITEMS_PROT_SIZE_TRUE;
- rText += SVX_RESSTR(nId);
+ rText += EE_RESSTR(nId);
rText += cpDelim;
nId = RID_SVXITEMS_PROT_POS_FALSE;
if ( bPos )
nId = RID_SVXITEMS_PROT_POS_TRUE;
- rText += SVX_RESSTR(nId);
+ rText += EE_RESSTR(nId);
return ePres;
}
default: ;//prevent warning
@@ -1477,28 +1462,28 @@ SfxItemPresentation SvxShadowItem::GetPresentation
if ( aShadowColor.GetTransparency() )
nId = RID_SVXITEMS_TRANSPARENT_TRUE;
- rText += SVX_RESSTR(nId);
+ rText += EE_RESSTR(nId);
rText += cpDelim;
rText += GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl );
rText += cpDelim;
- rText += SVX_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
+ rText += EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
return ePres;
}
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- rText = SVX_RESSTR(RID_SVXITEMS_SHADOW_COMPLETE);
+ rText = EE_RESSTR(RID_SVXITEMS_SHADOW_COMPLETE);
rText += ::GetColorString( aShadowColor );
rText += cpDelim;
sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE;
if ( aShadowColor.GetTransparency() )
nId = RID_SVXITEMS_TRANSPARENT_TRUE;
- rText += SVX_RESSTR(nId);
+ rText += EE_RESSTR(nId);
rText += cpDelim;
rText += GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl );
- rText += SVX_RESSTR(GetMetricId(ePresUnit));
+ rText += EE_RESSTR(GetMetricId(ePresUnit));
rText += cpDelim;
- rText += SVX_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
+ rText += EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
return ePres;
}
default: ;//prevent warning
@@ -1563,7 +1548,7 @@ sal_uInt16 SvxShadowItem::GetValueCount() const
XubString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" );
- return XubString( SVX_RES( RID_SVXITEMS_SHADOW_BEGIN + nPos ) );
+ return XubString( EditResId( RID_SVXITEMS_SHADOW_BEGIN + nPos ) );
}
// -----------------------------------------------------------------------
@@ -1697,10 +1682,10 @@ XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
aStr += cpDelim;
if ( nResId )
- aStr += SVX_RESSTR(nResId);
+ aStr += EE_RESSTR(nResId);
else
{
- String sMetric = SVX_RESSTR(GetMetricId( eDestUnit ));
+ String sMetric = EE_RESSTR(GetMetricId( eDestUnit ));
aStr += GetMetricText( (long)nInWidth, eSrcUnit, eDestUnit, pIntl );
if ( bMetricStr )
aStr += sMetric;
@@ -1842,7 +1827,7 @@ int SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const
}
// -----------------------------------------------------------------------
-table::BorderLine lcl_SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConvert)
+table::BorderLine SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConvert)
{
table::BorderLine aLine;
if(pLine)
@@ -1871,10 +1856,10 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// 4 Borders and 5 distances
uno::Sequence< uno::Any > aSeq( 9 );
- aSeq[0] = uno::makeAny( lcl_SvxLineToLine(GetLeft(), bConvert) );
- aSeq[1] = uno::makeAny( lcl_SvxLineToLine(GetRight(), bConvert) );
- aSeq[2] = uno::makeAny( lcl_SvxLineToLine(GetBottom(), bConvert) );
- aSeq[3] = uno::makeAny( lcl_SvxLineToLine(GetTop(), bConvert) );
+ aSeq[0] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetLeft(), bConvert) );
+ aSeq[1] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetRight(), bConvert) );
+ aSeq[2] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetBottom(), bConvert) );
+ aSeq[3] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetTop(), bConvert) );
aSeq[4] <<= uno::makeAny( (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED( GetDistance()) : GetDistance()));
aSeq[5] <<= uno::makeAny( (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED( nTopDist ) : nTopDist ));
aSeq[6] <<= uno::makeAny( (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED( nBottomDist ) : nBottomDist ));
@@ -1886,22 +1871,22 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case MID_LEFT_BORDER:
bSerialize = sal_True; // intentionally no break!
case LEFT_BORDER:
- aRetLine = lcl_SvxLineToLine(GetLeft(), bConvert);
+ aRetLine = SvxBoxItem::SvxLineToLine(GetLeft(), bConvert);
break;
case MID_RIGHT_BORDER:
bSerialize = sal_True; // intentionally no break!
case RIGHT_BORDER:
- aRetLine = lcl_SvxLineToLine(GetRight(), bConvert);
+ aRetLine = SvxBoxItem::SvxLineToLine(GetRight(), bConvert);
break;
case MID_BOTTOM_BORDER:
bSerialize = sal_True; // intentionally no break!
case BOTTOM_BORDER:
- aRetLine = lcl_SvxLineToLine(GetBottom(), bConvert);
+ aRetLine = SvxBoxItem::SvxLineToLine(GetBottom(), bConvert);
break;
case MID_TOP_BORDER:
bSerialize = sal_True; // intentionally no break!
case TOP_BORDER:
- aRetLine = lcl_SvxLineToLine(GetTop(), bConvert);
+ aRetLine = SvxBoxItem::SvxLineToLine(GetTop(), bConvert);
break;
case BORDER_DISTANCE:
nDist = GetDistance();
@@ -1948,7 +1933,7 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
// -----------------------------------------------------------------------
-sal_Bool lcl_LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
{
rSvxLine.SetColor( Color(rLine.Color));
rSvxLine.SetInWidth( sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.InnerLineWidth) : rLine.InnerLineWidth ));
@@ -1979,7 +1964,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
table::BorderLine aBorderLine;
if ( aSeq[0] >>= aBorderLine )
{
- sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+ sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
SetLine(bSet ? &aLine : 0, BOX_LINE_LEFT );
}
else
@@ -1987,7 +1972,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if ( aSeq[1] >>= aBorderLine )
{
- sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+ sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
SetLine(bSet ? &aLine : 0, BOX_LINE_RIGHT );
}
else
@@ -1995,7 +1980,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if ( aSeq[2] >>= aBorderLine )
{
- sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+ sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
SetLine(bSet ? &aLine : 0, BOX_LINE_BOTTOM );
}
else
@@ -2003,7 +1988,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if ( aSeq[3] >>= aBorderLine )
{
- sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+ sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
SetLine(bSet ? &aLine : 0, BOX_LINE_TOP );
}
else
@@ -2113,7 +2098,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
else
return sal_False;
- sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+ sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
SetLine(bSet ? &aLine : 0, nLine);
}
@@ -2191,12 +2176,12 @@ SfxItemPresentation SvxBoxItem::GetPresentation
{
if( !(pTop || pBottom || pLeft || pRight) )
{
- rText = SVX_RESSTR(RID_SVXITEMS_BORDER_NONE);
+ rText = EE_RESSTR(RID_SVXITEMS_BORDER_NONE);
rText += cpDelim;
}
else
{
- rText = SVX_RESSTR(RID_SVXITEMS_BORDER_COMPLETE);
+ rText = EE_RESSTR(RID_SVXITEMS_BORDER_COMPLETE);
if( pTop && pBottom && pLeft && pRight &&
*pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight )
{
@@ -2207,60 +2192,60 @@ SfxItemPresentation SvxBoxItem::GetPresentation
{
if ( pTop )
{
- rText += SVX_RESSTR(RID_SVXITEMS_BORDER_TOP);
+ rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP);
rText += pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
rText += cpDelim;
}
if ( pBottom )
{
- rText += SVX_RESSTR(RID_SVXITEMS_BORDER_BOTTOM);
+ rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM);
rText += pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
rText += cpDelim;
}
if ( pLeft )
{
- rText += SVX_RESSTR(RID_SVXITEMS_BORDER_LEFT);
+ rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT);
rText += pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
rText += cpDelim;
}
if ( pRight )
{
- rText += SVX_RESSTR(RID_SVXITEMS_BORDER_RIGHT);
+ rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT);
rText += pRight->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
rText += cpDelim;
}
}
}
- rText += SVX_RESSTR(RID_SVXITEMS_BORDER_DISTANCE);
+ rText += EE_RESSTR(RID_SVXITEMS_BORDER_DISTANCE);
if( nTopDist == nBottomDist && nTopDist == nLeftDist &&
nTopDist == nRightDist )
{
rText += GetMetricText( (long)nTopDist, eCoreUnit,
ePresUnit, pIntl );
- rText += SVX_RESSTR(GetMetricId(ePresUnit));
+ rText += EE_RESSTR(GetMetricId(ePresUnit));
}
else
{
- (((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_TOP))
+ (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP))
+= GetMetricText( (long)nTopDist, eCoreUnit,
ePresUnit, pIntl ))
- += SVX_RESSTR(GetMetricId(ePresUnit)))
+ += EE_RESSTR(GetMetricId(ePresUnit)))
+= cpDelim;
- (((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_BOTTOM))
+ (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM))
+= GetMetricText( (long)nBottomDist, eCoreUnit,
ePresUnit, pIntl ))
- += SVX_RESSTR(GetMetricId(ePresUnit)))
+ += EE_RESSTR(GetMetricId(ePresUnit)))
+= cpDelim;
- (((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_LEFT))
+ (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT))
+= GetMetricText( (long)nLeftDist, eCoreUnit,
ePresUnit, pIntl ))
- += SVX_RESSTR(GetMetricId(ePresUnit)))
+ += EE_RESSTR(GetMetricId(ePresUnit)))
+= cpDelim;
- ((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_RIGHT))
+ ((rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT))
+= GetMetricText( (long)nRightDist, eCoreUnit,
ePresUnit, pIntl ))
- += SVX_RESSTR(GetMetricId(ePresUnit));
+ += EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
@@ -2808,8 +2793,8 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// 2 BorderLines, flags, valid flags and distance
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq( 5 );
- aSeq[0] = ::com::sun::star::uno::makeAny( lcl_SvxLineToLine( pHori, bConvert) );
- aSeq[1] = ::com::sun::star::uno::makeAny( lcl_SvxLineToLine( pVert, bConvert) );
+ aSeq[0] = ::com::sun::star::uno::makeAny( SvxBoxItem::SvxLineToLine( pHori, bConvert) );
+ aSeq[1] = ::com::sun::star::uno::makeAny( SvxBoxItem::SvxLineToLine( pVert, bConvert) );
if ( IsTable() )
nVal |= 0x01;
if ( IsDist() )
@@ -2826,11 +2811,11 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case MID_HORIZONTAL:
bSerialize = sal_True;
- aRetLine = lcl_SvxLineToLine( pHori, bConvert);
+ aRetLine = SvxBoxItem::SvxLineToLine( pHori, bConvert);
break;
case MID_VERTICAL:
bSerialize = sal_True;
- aRetLine = lcl_SvxLineToLine( pVert, bConvert);
+ aRetLine = SvxBoxItem::SvxLineToLine( pVert, bConvert);
break;
case MID_FLAGS:
bIntMember = sal_True;
@@ -2897,7 +2882,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
sal_Int32 nVal( 0 );
if ( aSeq[0] >>= aBorderLine )
{
- sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+ sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
if ( bSet )
SetLine( &aLine, BOXINFO_LINE_HORI );
}
@@ -2905,7 +2890,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
return sal_False;
if ( aSeq[1] >>= aBorderLine )
{
- sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+ sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
if ( bSet )
SetLine( &aLine, BOXINFO_LINE_VERT );
}
@@ -2989,7 +2974,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
return sal_False;
SvxBorderLine aLine;
- sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+ sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
if ( bSet )
SetLine( &aLine, nMemberId == MID_HORIZONTAL ? BOXINFO_LINE_HORI : BOXINFO_LINE_VERT );
break;
@@ -3074,7 +3059,7 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation
XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" );
- XubString aStr( SVX_RES( RID_SVXITEMS_BREAK_BEGIN + nPos ) );
+ XubString aStr( EditResId( RID_SVXITEMS_BREAK_BEGIN + nPos ) );
return aStr;
}
@@ -3220,7 +3205,7 @@ SfxItemPresentation SvxFmtKeepItem::GetPresentation
if ( GetValue() )
nId = RID_SVXITEMS_FMTKEEP_TRUE;
- rText = SVX_RESSTR(nId);
+ rText = EE_RESSTR(nId);
return ePres;
}
default: ;//prevent warning
@@ -3287,7 +3272,7 @@ sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
nMemId &= ~CONVERT_TWIPS;
if ( nMemId == 0 )
{
- rVal <<= uno::makeAny( lcl_SvxLineToLine(pLine, bConvert) );
+ rVal <<= uno::makeAny( SvxBoxItem::SvxLineToLine(pLine, bConvert) );
return sal_True;
}
else if ( pLine )
@@ -3321,7 +3306,7 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
{
if ( !pLine )
pLine = new SvxBorderLine;
- if( !lcl_LineToSvxLine(aLine, *pLine, bConvert) )
+ if( !SvxBoxItem::LineToSvxLine(aLine, *pLine, bConvert) )
DELETEZ( pLine );
return sal_True;
}
@@ -3454,66 +3439,14 @@ public:
GraphicObject* pGraphicObject;
sal_Int8 nGraphicTransparency; //contains a percentage value which is
//copied to the GraphicObject when necessary
-#ifndef SVX_LIGHT
- SfxMediumRef xMedium;
-#endif
Link aDoneLink;
+ SvStream* pStream;
- SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0) {}
+ SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {}
};
-/*
-// class SvxBrushItemLink_Impl -------------------------------------------
-
-class SvxBrushItemLink_Impl : public SfxBrushItemLink
-{
- virtual Graphic GetGraphic( const String& rLink, const String& rFilter );
- virtual CreateSvxBrushTabPage GetBackgroundTabpageCreateFunc();
- virtual GetSvxBrushTabPageRanges GetBackgroundTabpageRanges();
-};
-
-// -----------------------------------------------------------------------
-
-Graphic SvxBrushItemLink_Impl::GetGraphic( const String& rLink, const String& rFilter)
-{
- Graphic aResult;
- SvxBrushItem aItem( rLink, rFilter, GPOS_TILED );
- const Graphic* pGraph = aItem.GetGraphic();
- if( pGraph )
- aResult = *pGraph;
- return aResult;
-}
-
-// -----------------------------------------------------------------------
-
-CreateSvxBrushTabPage SvxBrushItemLink_Impl::GetBackgroundTabpageCreateFunc()
-{
-#ifndef SVX_LIGHT
- return (CreateSvxBrushTabPage)SvxBackgroundTabPage::Create;
-#else
- return CreateSvxBrushTabPage();
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-GetSvxBrushTabPageRanges SvxBrushItemLink_Impl::GetBackgroundTabpageRanges()
-{
-#ifndef SVX_LIGHT
- return (GetSvxBrushTabPageRanges)SvxBackgroundTabPage::GetRanges;
-#else
- return GetSvxBrushTabPageRanges();
-#endif
-}
// -----------------------------------------------------------------------
-void SvxBrushItem::InitSfxLink()
-{
- SfxBrushItemLink::Set( new SvxBrushItemLink_Impl );
-}
-*/
-// -----------------------------------------------------------------------
-
void SvxBrushItem::SetDoneLink( const Link& rLink )
{
pImpl->aDoneLink = rLink;
@@ -3744,10 +3677,6 @@ SvxBrushItem::SvxBrushItem( const SvxBrushItem& rItem ) :
SvxBrushItem::~SvxBrushItem()
{
-#ifndef SVX_LIGHT
- if( pImpl->xMedium.Is() )
- pImpl->xMedium->SetDoneLink( Link() );
-#endif
delete pImpl->pGraphicObject;
delete pImpl;
delete pStrLink;
@@ -3958,7 +3887,6 @@ SfxItemPresentation SvxBrushItem::GetPresentation
XubString& rText, const IntlWrapper *
) const
{
-#ifndef SVX_LIGHT
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
@@ -3976,18 +3904,18 @@ SfxItemPresentation SvxBrushItem::GetPresentation
if ( aColor.GetTransparency() )
nId = RID_SVXITEMS_TRANSPARENT_TRUE;
- rText += SVX_RESSTR(nId);
+ rText += EE_RESSTR(nId);
}
else
{
- rText = SVX_RESSTR(RID_SVXITEMS_GRAPHIC);
+ rText = EE_RESSTR(RID_SVXITEMS_GRAPHIC);
}
return ePres;
}
default: ;//prevent warning
}
-#endif // !SVX_LIGHT
+
return SFX_ITEM_PRESENTATION_NONE;
}
@@ -4114,95 +4042,33 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
// const wegcasten, da const als logisches const zu verstehen ist
// wenn GetGraphic() gerufen wird, soll sich das Item darum kuemmern,
// eine gelinkte Grafik zu holen.
-
-GraphicFilter* GetGrfFilter();
-
-IMPL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void*, EMPTYARG )
-{
-#ifndef SVX_LIGHT
- pThis->pImpl->pGraphicObject = new GraphicObject;
- SvStream* pStream = pThis->pImpl->xMedium->GetInStream();
- if( pStream && !pStream->GetError() )
- {
- Graphic aGraphic;
- int nRes;
- pStream->Seek( STREAM_SEEK_TO_BEGIN );
- nRes = GetGrfFilter()->
- ImportGraphic( aGraphic, *pThis->pStrLink, *pStream,
- GRFILTER_FORMAT_DONTKNOW, NULL, GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG );
-
- if( nRes != GRFILTER_OK )
- {
- DELETEZ( pThis->pImpl->pGraphicObject );
- pThis->bLoadAgain = sal_False;
- }
- else
- {
- pThis->pImpl->pGraphicObject->SetGraphic( aGraphic );
- pThis->ApplyGraphicTransparency_Impl();
- }
- }
- else
- {
- DELETEZ( pThis->pImpl->pGraphicObject );
- pThis->bLoadAgain = sal_False;
- }
-
- pThis->pImpl->xMedium.Clear();
- pThis->pImpl->aDoneLink.Call( pThis );
-#endif
- return 0;
-}
-
// -----------------------------------------------------------------------
void SvxBrushItem::PurgeGraphic() const
{
-#ifndef SVX_LIGHT
PurgeMedium();
DELETEZ( pImpl->pGraphicObject );
((SvxBrushItem*)this)->bLoadAgain = sal_True;
-#endif
}
// -----------------------------------------------------------------------
void SvxBrushItem::PurgeMedium() const
{
-#ifndef SVX_LIGHT
- pImpl->xMedium.Clear();
-#endif
+ DELETEZ( pImpl->pStream );
}
// -----------------------------------------------------------------------
-
-const GraphicObject* SvxBrushItem::GetGraphicObject( SfxObjectShell* pSh ) const
+const GraphicObject* SvxBrushItem::GetGraphicObject() const
{
-#ifndef SVX_LIGHT
- if ( bLoadAgain && pStrLink && !pImpl->pGraphicObject && !pImpl->xMedium.Is() )
+ if ( bLoadAgain && pStrLink && !pImpl->pGraphicObject )
// wenn Grafik schon geladen, als Cache benutzen
{
//JP 29.6.2001: only with "valid" names - empty names now allowed
if( pStrLink->Len() )
{
- pImpl->xMedium = new SfxMedium(
- *pStrLink, STREAM_STD_READ, sal_False );
-
- if( pImpl->xMedium->IsRemote() )
- {
- if( pSh )
- {
- pSh->RegisterTransfer( *pImpl->xMedium );
- }
- else
- {
- DBG_WARNING( "SvxBrushItem::GetGraphic ohne DocShell" );
- }
- }
-
- SfxMediumRef xRef( pImpl->xMedium );
- // Ref halten wg. synchr. DoneCallback
- if( pImpl->aDoneLink.IsSet() )
+ // currently we don't have asynchronous processing
+/* if( pImpl->aDoneLink.IsSet() )
{
// Auf besonderen Wunsch des Writers wird der synchrone und der
// asynchrone Fall was die Benachrichtigung angeht unterschiedlich
@@ -4214,23 +4080,47 @@ const GraphicObject* SvxBrushItem::GetGraphicObject( SfxObjectShell* pSh ) const
pImpl->xMedium->DownLoad(
STATIC_LINK( this, SvxBrushItem, DoneHdl_Impl ) );
pImpl->aDoneLink = aTmp;
+ } */
+
+ pImpl->pStream = utl::UcbStreamHelper::CreateStream( *pStrLink, STREAM_STD_READ );
+ if( pImpl->pStream && !pImpl->pStream->GetError() )
+ {
+ Graphic aGraphic;
+ int nRes;
+ pImpl->pStream->Seek( STREAM_SEEK_TO_BEGIN );
+ nRes = GraphicFilter::GetGraphicFilter()->
+ ImportGraphic( aGraphic, *pStrLink, *pImpl->pStream,
+ GRFILTER_FORMAT_DONTKNOW, NULL, GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG );
+
+ if( nRes != GRFILTER_OK )
+ {
+ const_cast < SvxBrushItem*> (this)->bLoadAgain = sal_False;
+ }
+ else
+ {
+ pImpl->pGraphicObject = new GraphicObject;
+ pImpl->pGraphicObject->SetGraphic( aGraphic );
+ const_cast < SvxBrushItem*> (this)->ApplyGraphicTransparency_Impl();
+ }
}
else
{
- pImpl->xMedium->DownLoad( );
- DoneHdl_Impl( (SvxBrushItem*)this, 0 );
+ const_cast < SvxBrushItem*> (this)->bLoadAgain = sal_False;
}
+
+ // currently we don't have asynchronous processing
+// pThis->pImpl->aDoneLink.Call( pThis );
}
}
-#endif
+
return pImpl->pGraphicObject;
}
// -----------------------------------------------------------------------
-const Graphic* SvxBrushItem::GetGraphic( SfxObjectShell* pSh ) const
+const Graphic* SvxBrushItem::GetGraphic() const
{
- const GraphicObject* pGrafObj = GetGraphicObject( pSh );
+ const GraphicObject* pGrafObj = GetGraphicObject();
return( pGrafObj ? &( pGrafObj->GetGraphic() ) : NULL );
}