[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/CppunitTest_sw_htmlexport.mk sw/CppunitTest_sw_odfimport.mk sw/CppunitTest_sw_uiwriter.mk sw/Executable_tiledrendering.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk sw/source
roopak12345
mailstorpk at gmail.com
Sun Mar 9 13:54:09 PDT 2014
sw/AllLangResTarget_sw.mk | 35
sw/CppunitTest_sw_htmlexport.mk | 1
sw/CppunitTest_sw_odfimport.mk | 1
sw/CppunitTest_sw_uiwriter.mk | 1
sw/Executable_tiledrendering.mk | 2
sw/Library_sw.mk | 420
sw/Library_swui.mk | 1
sw/Library_vbaswobj.mk | 1
sw/source/core/access/accembedded.cxx | 4
sw/source/core/access/accpara.cxx | 2
sw/source/core/uibase/app/appenv.cxx | 508 +
sw/source/core/uibase/app/apphdl.cxx | 888 ++
sw/source/core/uibase/app/applab.cxx | 403
sw/source/core/uibase/app/appopt.cxx | 560 +
sw/source/core/uibase/app/docsh.cxx | 1327 +++
sw/source/core/uibase/app/docsh2.cxx | 1586 +++
sw/source/core/uibase/app/docshdrw.cxx | 54
sw/source/core/uibase/app/docshini.cxx | 682 +
sw/source/core/uibase/app/docst.cxx | 1255 ++
sw/source/core/uibase/app/docstyle.cxx | 2973 ++++++
sw/source/core/uibase/app/mainwn.cxx | 141
sw/source/core/uibase/app/swdll.cxx | 164
sw/source/core/uibase/app/swdllimpl.hxx | 36
sw/source/core/uibase/app/swmodul1.cxx | 659 +
sw/source/core/uibase/app/swmodule.cxx | 427
sw/source/core/uibase/app/swwait.cxx | 84
sw/source/core/uibase/cctrl/actctrl.cxx | 134
sw/source/core/uibase/cctrl/popbox.cxx | 63
sw/source/core/uibase/cctrl/swlbox.cxx | 137
sw/source/core/uibase/chrdlg/ccoll.cxx | 187
sw/source/core/uibase/config/barcfg.cxx | 127
sw/source/core/uibase/config/caption.cxx | 76
sw/source/core/uibase/config/cfgitems.cxx | 358
sw/source/core/uibase/config/dbconfig.cxx | 120
sw/source/core/uibase/config/fontcfg.cxx | 320
sw/source/core/uibase/config/modcfg.cxx | 1398 +++
sw/source/core/uibase/config/prtopt.cxx | 175
sw/source/core/uibase/config/uinums.cxx | 567 +
sw/source/core/uibase/config/usrpref.cxx | 592 +
sw/source/core/uibase/config/viewopt.cxx | 550 +
sw/source/core/uibase/dbui/dbmgr.cxx | 2960 ++++++
sw/source/core/uibase/dbui/dbtree.cxx | 524 +
sw/source/core/uibase/dbui/dbui.cxx | 87
sw/source/core/uibase/dbui/maildispatcher.cxx | 275
sw/source/core/uibase/dbui/mailmergechildwindow.cxx | 666 +
sw/source/core/uibase/dbui/mailmergechildwindow.hrc | 47
sw/source/core/uibase/dbui/mailmergechildwindow.src | 210
sw/source/core/uibase/dbui/mailmergehelper.cxx | 906 ++
sw/source/core/uibase/dbui/mmconfigitem.cxx | 1739 +++
sw/source/core/uibase/dbui/swdbtoolsclient.cxx | 232
sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx | 843 +
sw/source/core/uibase/dialog/regionsw.cxx | 242
sw/source/core/uibase/dialog/regionsw.hrc | 42
sw/source/core/uibase/dialog/regionsw.src | 119
sw/source/core/uibase/dialog/swabstdlg.cxx | 59
sw/source/core/uibase/dialog/swwrtshitem.cxx | 43
sw/source/core/uibase/dialog/wordcountwrapper.cxx | 49
sw/source/core/uibase/dochdl/gloshdl.cxx | 753 +
sw/source/core/uibase/dochdl/swdtflvr.cxx | 3783 ++++++++
sw/source/core/uibase/docvw/AnchorOverlayObject.cxx | 449 +
sw/source/core/uibase/docvw/AnchorOverlayObject.hxx | 133
sw/source/core/uibase/docvw/AnnotationMenuButton.cxx | 203
sw/source/core/uibase/docvw/AnnotationMenuButton.hxx | 53
sw/source/core/uibase/docvw/AnnotationWin.cxx | 318
sw/source/core/uibase/docvw/DashedLine.cxx | 97
sw/source/core/uibase/docvw/FrameControlsManager.cxx | 159
sw/source/core/uibase/docvw/HeaderFooterWin.cxx | 520 +
sw/source/core/uibase/docvw/OverlayRanges.cxx | 180
sw/source/core/uibase/docvw/OverlayRanges.hxx | 78
sw/source/core/uibase/docvw/PageBreakWin.cxx | 463 +
sw/source/core/uibase/docvw/PostItMgr.cxx | 1939 ++++
sw/source/core/uibase/docvw/ShadowOverlayObject.cxx | 252
sw/source/core/uibase/docvw/ShadowOverlayObject.hxx | 70
sw/source/core/uibase/docvw/SidebarTxtControl.cxx | 408
sw/source/core/uibase/docvw/SidebarTxtControl.hxx | 75
sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx | 293
sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx | 46
sw/source/core/uibase/docvw/SidebarWin.cxx | 1354 +++
sw/source/core/uibase/docvw/SidebarWinAcc.cxx | 143
sw/source/core/uibase/docvw/SidebarWinAcc.hxx | 57
sw/source/core/uibase/docvw/annotation.hrc | 45
sw/source/core/uibase/docvw/docvw.hrc | 91
sw/source/core/uibase/docvw/docvw.src | 307
sw/source/core/uibase/docvw/edtdd.cxx | 495 +
sw/source/core/uibase/docvw/edtwin.cxx | 6157 ++++++++++++++
sw/source/core/uibase/docvw/edtwin2.cxx | 526 +
sw/source/core/uibase/docvw/edtwin3.cxx | 193
sw/source/core/uibase/docvw/frmsidebarwincontainer.cxx | 204
sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx | 63
sw/source/core/uibase/docvw/romenu.cxx | 368
sw/source/core/uibase/docvw/romenu.hxx | 64
sw/source/core/uibase/docvw/srcedtw.cxx | 993 ++
sw/source/core/uibase/envelp/envimg.cxx | 355
sw/source/core/uibase/envelp/label.hrc | 42
sw/source/core/uibase/envelp/labelcfg.cxx | 358
sw/source/core/uibase/envelp/labimg.cxx | 473 +
sw/source/core/uibase/envelp/labimp.hxx | 114
sw/source/core/uibase/envelp/syncbtn.cxx | 82
sw/source/core/uibase/fldui/fldmgr.cxx | 1773 ++++
sw/source/core/uibase/fldui/fldwrap.cxx | 161
sw/source/core/uibase/fldui/xfldui.cxx | 168
sw/source/core/uibase/frmdlg/colex.cxx | 589 +
sw/source/core/uibase/frmdlg/colmgr.cxx | 150
sw/source/core/uibase/frmdlg/frmmgr.cxx | 608 +
sw/source/core/uibase/globdoc/globdoc.cxx | 73
sw/source/core/uibase/inc/DashedLine.hxx | 30
sw/source/core/uibase/inc/DropDownFieldDialog.hxx | 58
sw/source/core/uibase/inc/FrameControl.hxx | 53
sw/source/core/uibase/inc/FrameControlsManager.hxx | 56
sw/source/core/uibase/inc/HeaderFooterWin.hxx | 58
sw/source/core/uibase/inc/PageBreakWin.hxx | 63
sw/source/core/uibase/inc/SidebarWindowsConsts.hxx | 31
sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx | 67
sw/source/core/uibase/inc/SwXFilterOptions.hxx | 101
sw/source/core/uibase/inc/abstract.hxx | 42
sw/source/core/uibase/inc/actctrl.hxx | 92
sw/source/core/uibase/inc/addrdlg.hxx | 32
sw/source/core/uibase/inc/annotsh.hxx | 74
sw/source/core/uibase/inc/app.hrc | 118
sw/source/core/uibase/inc/ascfldlg.hxx | 62
sw/source/core/uibase/inc/autoedit.hxx | 37
sw/source/core/uibase/inc/barcfg.hxx | 41
sw/source/core/uibase/inc/basesh.hxx | 115
sw/source/core/uibase/inc/beziersh.hxx | 38
sw/source/core/uibase/inc/bmpwin.hxx | 56
sw/source/core/uibase/inc/bookctrl.hxx | 47
sw/source/core/uibase/inc/bookmark.hxx | 70
sw/source/core/uibase/inc/break.hxx | 75
sw/source/core/uibase/inc/caption.hxx | 98
sw/source/core/uibase/inc/cfgid.h | 28
sw/source/core/uibase/inc/cfgitems.hxx | 221
sw/source/core/uibase/inc/changedb.hxx | 68
sw/source/core/uibase/inc/chartins.hxx | 27
sw/source/core/uibase/inc/chldwrap.hxx | 47
sw/source/core/uibase/inc/chrdlg.hxx | 94
sw/source/core/uibase/inc/chrdlgmodes.hxx | 21
sw/source/core/uibase/inc/cnttab.hxx | 88
sw/source/core/uibase/inc/colex.hxx | 109
sw/source/core/uibase/inc/colmgr.hxx | 127
sw/source/core/uibase/inc/column.hxx | 206
sw/source/core/uibase/inc/conarc.hxx | 48
sw/source/core/uibase/inc/concustomshape.hxx | 63
sw/source/core/uibase/inc/condedit.hxx | 49
sw/source/core/uibase/inc/conform.hxx | 38
sw/source/core/uibase/inc/conpoly.hxx | 47
sw/source/core/uibase/inc/conrect.hxx | 51
sw/source/core/uibase/inc/content.hxx | 208
sw/source/core/uibase/inc/conttree.hxx | 329
sw/source/core/uibase/inc/convert.hxx | 74
sw/source/core/uibase/inc/cption.hxx | 113
sw/source/core/uibase/inc/dbconfig.hxx | 47
sw/source/core/uibase/inc/dbinsdlg.hxx | 171
sw/source/core/uibase/inc/dbtree.hxx | 72
sw/source/core/uibase/inc/dbui.hxx | 70
sw/source/core/uibase/inc/dialmgr.hxx | 31
sw/source/core/uibase/inc/docfnote.hxx | 44
sw/source/core/uibase/inc/docstdlg.hxx | 70
sw/source/core/uibase/inc/drawbase.hxx | 79
sw/source/core/uibase/inc/drawsh.hxx | 50
sw/source/core/uibase/inc/drformsh.hxx | 41
sw/source/core/uibase/inc/drpcps.hxx | 103
sw/source/core/uibase/inc/drwbassh.hxx | 56
sw/source/core/uibase/inc/drwtxtsh.hxx | 80
sw/source/core/uibase/inc/dselect.hxx | 43
sw/source/core/uibase/inc/edtwin.hxx | 302
sw/source/core/uibase/inc/envimg.hxx | 91
sw/source/core/uibase/inc/envlop.hxx | 122
sw/source/core/uibase/inc/fldedt.hxx | 55
sw/source/core/uibase/inc/fldmgr.hxx | 217
sw/source/core/uibase/inc/fldtdlg.hxx | 66
sw/source/core/uibase/inc/fldwrap.hxx | 56
sw/source/core/uibase/inc/fontcfg.hxx | 112
sw/source/core/uibase/inc/formatclipboard.hxx | 95
sw/source/core/uibase/inc/formedt.hxx | 92
sw/source/core/uibase/inc/frmdlg.hxx | 68
sw/source/core/uibase/inc/frmmgr.hxx | 188
sw/source/core/uibase/inc/frmpage.hxx | 328
sw/source/core/uibase/inc/frmsh.hxx | 44
sw/source/core/uibase/inc/frmui.hrc | 71
sw/source/core/uibase/inc/globals.h | 31
sw/source/core/uibase/inc/globdoc.hrc | 44
sw/source/core/uibase/inc/glosbib.hxx | 116
sw/source/core/uibase/inc/glosdoc.hxx | 135
sw/source/core/uibase/inc/gloshdl.hxx | 104
sw/source/core/uibase/inc/gloslst.hxx | 82
sw/source/core/uibase/inc/glossary.hxx | 168
sw/source/core/uibase/inc/glshell.hxx | 85
sw/source/core/uibase/inc/grfsh.hxx | 41
sw/source/core/uibase/inc/hyp.hxx | 58
sw/source/core/uibase/inc/idxmrk.hxx | 60
sw/source/core/uibase/inc/imaildsplistener.hxx | 70
sw/source/core/uibase/inc/initui.hxx | 66
sw/source/core/uibase/inc/inpdlg.hxx | 63
sw/source/core/uibase/inc/inputwin.hxx | 119
sw/source/core/uibase/inc/insfnote.hxx | 85
sw/source/core/uibase/inc/instable.hxx | 76
sw/source/core/uibase/inc/javaedit.hxx | 88
sw/source/core/uibase/inc/label.hxx | 93
sw/source/core/uibase/inc/labelcfg.hxx | 61
sw/source/core/uibase/inc/labimg.hxx | 125
sw/source/core/uibase/inc/langhelper.hxx | 62
sw/source/core/uibase/inc/linenum.hxx | 64
sw/source/core/uibase/inc/listsh.hxx | 38
sw/source/core/uibase/inc/macassgn.hxx | 47
sw/source/core/uibase/inc/mailconfigpage.hxx | 77
sw/source/core/uibase/inc/maildispatcher.hxx | 154
sw/source/core/uibase/inc/mailmergechildwindow.hxx | 52
sw/source/core/uibase/inc/mailmergehelper.hxx | 310
sw/source/core/uibase/inc/mailmergewizard.hxx | 97
sw/source/core/uibase/inc/mailmrge.hxx | 176
sw/source/core/uibase/inc/mediash.hxx | 37
sw/source/core/uibase/inc/mergetbl.hxx | 41
sw/source/core/uibase/inc/misc.hrc | 60
sw/source/core/uibase/inc/mmconfigitem.hxx | 270
sw/source/core/uibase/inc/multmrk.hxx | 53
sw/source/core/uibase/inc/navicfg.hxx | 109
sw/source/core/uibase/inc/navicont.hxx | 54
sw/source/core/uibase/inc/navipi.hxx | 186
sw/source/core/uibase/inc/navmgr.hxx | 56
sw/source/core/uibase/inc/navsh.hxx | 28
sw/source/core/uibase/inc/num.hxx | 166
sw/source/core/uibase/inc/numberingtypelistbox.hxx | 51
sw/source/core/uibase/inc/numfmtlb.hxx | 73
sw/source/core/uibase/inc/numpara.hxx | 86
sw/source/core/uibase/inc/numprevw.hxx | 71
sw/source/core/uibase/inc/olesh.hxx | 35
sw/source/core/uibase/inc/olmenu.hxx | 91
sw/source/core/uibase/inc/optcomp.hxx | 75
sw/source/core/uibase/inc/optload.hxx | 175
sw/source/core/uibase/inc/optpage.hxx | 439
sw/source/core/uibase/inc/outline.hxx | 138
sw/source/core/uibase/inc/pardlg.hxx | 30
sw/source/core/uibase/inc/pattern.hxx | 36
sw/source/core/uibase/inc/pgfnote.hxx | 77
sw/source/core/uibase/inc/pggrid.hxx | 101
sw/source/core/uibase/inc/popbox.hxx | 57
sw/source/core/uibase/inc/popup.hrc | 49
sw/source/core/uibase/inc/prcntfld.hxx | 111
sw/source/core/uibase/inc/pview.hxx | 301
sw/source/core/uibase/inc/redline_tmpl.hrc | 39
sw/source/core/uibase/inc/redlndlg.hxx | 162
sw/source/core/uibase/inc/regionsw.hxx | 303
sw/source/core/uibase/inc/ribbar.hrc | 104
sw/source/core/uibase/inc/rowht.hxx | 44
sw/source/core/uibase/inc/scroll.hxx | 59
sw/source/core/uibase/inc/selglos.hxx | 54
sw/source/core/uibase/inc/sharedconnection.hxx | 30
sw/source/core/uibase/inc/shdwcrsr.hxx | 57
sw/source/core/uibase/inc/shells.hrc | 100
sw/source/core/uibase/inc/splittbl.hxx | 49
sw/source/core/uibase/inc/srcedtw.hxx | 157
sw/source/core/uibase/inc/srcview.hxx | 89
sw/source/core/uibase/inc/srtdlg.hxx | 92
sw/source/core/uibase/inc/stmenu.hxx | 74
sw/source/core/uibase/inc/swcont.hxx | 99
sw/source/core/uibase/inc/swdtflvr.hxx | 213
sw/source/core/uibase/inc/swlbox.hxx | 86
sw/source/core/uibase/inc/swmessdialog.hxx | 30
sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx | 40
sw/source/core/uibase/inc/swrenamexnameddlg.hxx | 69
sw/source/core/uibase/inc/swruler.hxx | 122
sw/source/core/uibase/inc/swtablerep.hxx | 84
sw/source/core/uibase/inc/swuiccoll.hxx | 75
sw/source/core/uibase/inc/swuicnttab.hxx | 497 +
sw/source/core/uibase/inc/swuiidxmrk.hxx | 253
sw/source/core/uibase/inc/swuipardlg.hxx | 53
sw/source/core/uibase/inc/swvset.hxx | 32
sw/source/core/uibase/inc/swwrtshitem.hxx | 45
sw/source/core/uibase/inc/syncbtn.hxx | 53
sw/source/core/uibase/inc/table.hrc | 37
sw/source/core/uibase/inc/tabledlg.hxx | 49
sw/source/core/uibase/inc/tablemgr.hxx | 88
sw/source/core/uibase/inc/tabsh.hxx | 52
sw/source/core/uibase/inc/tautofmt.hxx | 91
sw/source/core/uibase/inc/tblctrl.hxx | 40
sw/source/core/uibase/inc/tblnumfm.hxx | 35
sw/source/core/uibase/inc/tbxanchr.hxx | 42
sw/source/core/uibase/inc/textsh.hxx | 83
sw/source/core/uibase/inc/titlepage.hxx | 70
sw/source/core/uibase/inc/tmpdlg.hxx | 89
sw/source/core/uibase/inc/tmplctrl.hxx | 45
sw/source/core/uibase/inc/toolbox.hrc | 553 +
sw/source/core/uibase/inc/toxmgr.hxx | 310
sw/source/core/uibase/inc/uiborder.hxx | 41
sw/source/core/uibase/inc/uiitems.hxx | 119
sw/source/core/uibase/inc/uinums.hxx | 123
sw/source/core/uibase/inc/uitool.hxx | 109
sw/source/core/uibase/inc/uivwimp.hxx | 173
sw/source/core/uibase/inc/unoatxt.hxx | 283
sw/source/core/uibase/inc/unodispatch.hxx | 128
sw/source/core/uibase/inc/unomailmerge.hxx | 191
sw/source/core/uibase/inc/unomod.hxx | 161
sw/source/core/uibase/inc/unotools.hxx | 121
sw/source/core/uibase/inc/unotxvw.hxx | 338
sw/source/core/uibase/inc/usrpref.hxx | 276
sw/source/core/uibase/inc/utlui.hrc | 189
sw/source/core/uibase/inc/view.hxx | 689 +
sw/source/core/uibase/inc/viewlayoutctrl.hxx | 46
sw/source/core/uibase/inc/web.hrc | 47
sw/source/core/uibase/inc/wformsh.hxx | 36
sw/source/core/uibase/inc/wfrmsh.hxx | 38
sw/source/core/uibase/inc/wgrfsh.hxx | 36
sw/source/core/uibase/inc/wlistsh.hxx | 36
sw/source/core/uibase/inc/wolesh.hxx | 35
sw/source/core/uibase/inc/wordcountctrl.hxx | 33
sw/source/core/uibase/inc/wordcountdialog.hxx | 79
sw/source/core/uibase/inc/workctrl.hxx | 185
sw/source/core/uibase/inc/wrap.hxx | 117
sw/source/core/uibase/inc/wrtsh.hxx | 646 +
sw/source/core/uibase/inc/wtabsh.hxx | 36
sw/source/core/uibase/inc/wtextsh.hxx | 38
sw/source/core/uibase/inc/wview.hxx | 41
sw/source/core/uibase/inc/zoomctrl.hxx | 43
sw/source/core/uibase/index/idxmrk.cxx | 114
sw/source/core/uibase/index/idxmrk.hrc | 26
sw/source/core/uibase/index/toxmgr.cxx | 525 +
sw/source/core/uibase/lingu/hhcwrp.cxx | 720 +
sw/source/core/uibase/lingu/hyp.cxx | 132
sw/source/core/uibase/lingu/olmenu.cxx | 891 ++
sw/source/core/uibase/lingu/olmenu.hrc | 89
sw/source/core/uibase/lingu/olmenu.src | 131
sw/source/core/uibase/lingu/sdrhhcwrap.cxx | 175
sw/source/core/uibase/lingu/sdrhhcwrap.hxx | 56
sw/source/core/uibase/misc/glosdoc.cxx | 693 +
sw/source/core/uibase/misc/glshell.cxx | 274
sw/source/core/uibase/misc/numberingtypelistbox.cxx | 164
sw/source/core/uibase/misc/redlndlg.cxx | 1210 ++
sw/source/core/uibase/misc/redlndlg.hrc | 28
sw/source/core/uibase/misc/redlndlg.src | 85
sw/source/core/uibase/misc/swruler.cxx | 302
sw/source/core/uibase/ribbar/conarc.cxx | 102
sw/source/core/uibase/ribbar/concustomshape.cxx | 196
sw/source/core/uibase/ribbar/conform.cxx | 110
sw/source/core/uibase/ribbar/conpoly.cxx | 107
sw/source/core/uibase/ribbar/conrect.cxx | 187
sw/source/core/uibase/ribbar/drawbase.cxx | 623 +
sw/source/core/uibase/ribbar/dselect.cxx | 72
sw/source/core/uibase/ribbar/inputwin.cxx | 636 +
sw/source/core/uibase/ribbar/inputwin.hrc | 62
sw/source/core/uibase/ribbar/inputwin.src | 290
sw/source/core/uibase/ribbar/tblctrl.cxx | 55
sw/source/core/uibase/ribbar/tbxanchr.cxx | 124
sw/source/core/uibase/ribbar/workctrl.cxx | 775 +
sw/source/core/uibase/ribbar/workctrl.hrc | 75
sw/source/core/uibase/ribbar/workctrl.src | 382
sw/source/core/uibase/shells/annotsh.cxx | 1760 ++++
sw/source/core/uibase/shells/basesh.cxx | 2832 ++++++
sw/source/core/uibase/shells/beziersh.cxx | 330
sw/source/core/uibase/shells/drawdlg.cxx | 234
sw/source/core/uibase/shells/drawsh.cxx | 597 +
sw/source/core/uibase/shells/drformsh.cxx | 258
sw/source/core/uibase/shells/drwbassh.cxx | 961 ++
sw/source/core/uibase/shells/drwtxtex.cxx | 1084 ++
sw/source/core/uibase/shells/drwtxtsh.cxx | 878 +
sw/source/core/uibase/shells/frmsh.cxx | 1185 ++
sw/source/core/uibase/shells/grfsh.cxx | 892 ++
sw/source/core/uibase/shells/grfshex.cxx | 154
sw/source/core/uibase/shells/langhelper.cxx | 612 +
sw/source/core/uibase/shells/listsh.cxx | 280
sw/source/core/uibase/shells/mediash.cxx | 199
sw/source/core/uibase/shells/navsh.cxx | 106
sw/source/core/uibase/shells/olesh.cxx | 55
sw/source/core/uibase/shells/slotadd.cxx | 139
sw/source/core/uibase/shells/tabsh.cxx | 1476 +++
sw/source/core/uibase/shells/textdrw.cxx | 122
sw/source/core/uibase/shells/textfld.cxx | 923 ++
sw/source/core/uibase/shells/textglos.cxx | 129
sw/source/core/uibase/shells/textidx.cxx | 251
sw/source/core/uibase/shells/textsh.cxx | 1131 ++
sw/source/core/uibase/shells/textsh1.cxx | 1811 ++++
sw/source/core/uibase/shells/textsh2.cxx | 285
sw/source/core/uibase/shells/txtattr.cxx | 743 +
sw/source/core/uibase/shells/txtcrsr.cxx | 376
sw/source/core/uibase/shells/txtnum.cxx | 410
sw/source/core/uibase/sidebar/PageColumnControl.cxx | 110
sw/source/core/uibase/sidebar/PageColumnControl.hxx | 65
sw/source/core/uibase/sidebar/PageMarginControl.cxx | 518 +
sw/source/core/uibase/sidebar/PageMarginControl.hxx | 121
sw/source/core/uibase/sidebar/PageOrientationControl.cxx | 90
sw/source/core/uibase/sidebar/PageOrientationControl.hxx | 56
sw/source/core/uibase/sidebar/PagePropertyPanel.cxx | 742 +
sw/source/core/uibase/sidebar/PagePropertyPanel.hrc | 188
sw/source/core/uibase/sidebar/PagePropertyPanel.hxx | 223
sw/source/core/uibase/sidebar/PageSizeControl.cxx | 177
sw/source/core/uibase/sidebar/PageSizeControl.hxx | 71
sw/source/core/uibase/sidebar/PropertyPanel.hrc | 35
sw/source/core/uibase/sidebar/SwPanelFactory.cxx | 148
sw/source/core/uibase/sidebar/WrapPropertyPanel.cxx | 243
sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx | 88
sw/source/core/uibase/smartmenu/stmenu.cxx | 170
sw/source/core/uibase/smartmenu/stmenu.hrc | 33
sw/source/core/uibase/smartmenu/stmenu.src | 37
sw/source/core/uibase/table/chartins.cxx | 254
sw/source/core/uibase/table/swtablerep.cxx | 186
sw/source/core/uibase/table/tablemgr.cxx | 349
sw/source/core/uibase/table/tablepg.hxx | 195
sw/source/core/uibase/uiview/formatclipboard.cxx | 608 +
sw/source/core/uibase/uiview/pview.cxx | 1909 ++++
sw/source/core/uibase/uiview/scroll.cxx | 121
sw/source/core/uibase/uiview/srcview.cxx | 873 +
sw/source/core/uibase/uiview/swcli.cxx | 172
sw/source/core/uibase/uiview/uivwimp.cxx | 305
sw/source/core/uibase/uiview/view.cxx | 1822 ++++
sw/source/core/uibase/uiview/view.hrc | 74
sw/source/core/uibase/uiview/view.src | 149
sw/source/core/uibase/uiview/view0.cxx | 581 +
sw/source/core/uibase/uiview/view1.cxx | 185
sw/source/core/uibase/uiview/view2.cxx | 2469 +++++
sw/source/core/uibase/uiview/viewcoll.cxx | 80
sw/source/core/uibase/uiview/viewdlg.cxx | 75
sw/source/core/uibase/uiview/viewdlg2.cxx | 202
sw/source/core/uibase/uiview/viewdraw.cxx | 755 +
sw/source/core/uibase/uiview/viewfunc.hxx | 53
sw/source/core/uibase/uiview/viewling.cxx | 898 ++
sw/source/core/uibase/uiview/viewmdi.cxx | 614 +
sw/source/core/uibase/uiview/viewport.cxx | 1275 ++
sw/source/core/uibase/uiview/viewprt.cxx | 306
sw/source/core/uibase/uiview/viewsrch.cxx | 814 +
sw/source/core/uibase/uiview/viewstat.cxx | 526 +
sw/source/core/uibase/uiview/viewtab.cxx | 2010 ++++
sw/source/core/uibase/uno/SwXDocumentSettings.cxx | 1254 ++
sw/source/core/uibase/uno/SwXDocumentSettings.hxx | 93
sw/source/core/uibase/uno/SwXFilterOptions.cxx | 179
sw/source/core/uibase/uno/dlelstnr.cxx | 165
sw/source/core/uibase/uno/unoatxt.cxx | 1121 ++
sw/source/core/uibase/uno/unodefaults.cxx | 51
sw/source/core/uibase/uno/unodefaults.hxx | 40
sw/source/core/uibase/uno/unodispatch.cxx | 392
sw/source/core/uibase/uno/unodoc.cxx | 113
sw/source/core/uibase/uno/unofreg.cxx | 373
sw/source/core/uibase/uno/unomailmerge.cxx | 1227 ++
sw/source/core/uibase/uno/unomod.cxx | 990 ++
sw/source/core/uibase/uno/unomodule.cxx | 154
sw/source/core/uibase/uno/unomodule.hxx | 81
sw/source/core/uibase/uno/unotxdoc.cxx | 3994 +++++++++
sw/source/core/uibase/uno/unotxvw.cxx | 1851 ++++
sw/source/core/uibase/utlui/attrdesc.cxx | 1248 ++
sw/source/core/uibase/utlui/attrdesc.hrc | 115
sw/source/core/uibase/utlui/attrdesc.src | 363
sw/source/core/uibase/utlui/bookctrl.cxx | 128
sw/source/core/uibase/utlui/condedit.cxx | 90
sw/source/core/uibase/utlui/content.cxx | 3517 +++++++
sw/source/core/uibase/utlui/glbltree.cxx | 1374 +++
sw/source/core/uibase/utlui/gloslst.cxx | 418
sw/source/core/uibase/utlui/initui.cxx | 337
sw/source/core/uibase/utlui/initui.hrc | 57
sw/source/core/uibase/utlui/initui.src | 412
sw/source/core/uibase/utlui/navicfg.cxx | 119
sw/source/core/uibase/utlui/navipi.cxx | 1384 +++
sw/source/core/uibase/utlui/navipi.hrc | 74
sw/source/core/uibase/utlui/navipi.src | 508 +
sw/source/core/uibase/utlui/numfmtlb.cxx | 488 +
sw/source/core/uibase/utlui/prcntfld.cxx | 287
sw/source/core/uibase/utlui/shdwcrsr.cxx | 120
sw/source/core/uibase/utlui/tmplctrl.cxx | 137
sw/source/core/uibase/utlui/uiitems.cxx | 317
sw/source/core/uibase/utlui/uitool.cxx | 818 +
sw/source/core/uibase/utlui/unotools.cxx | 562 +
sw/source/core/uibase/utlui/unotools.hrc | 35
sw/source/core/uibase/utlui/unotools.src | 42
sw/source/core/uibase/utlui/viewlayoutctrl.cxx | 195
sw/source/core/uibase/utlui/wordcountctrl.cxx | 27
sw/source/core/uibase/utlui/zoomctrl.cxx | 72
sw/source/core/uibase/web/wdocsh.cxx | 86
sw/source/core/uibase/web/wformsh.cxx | 56
sw/source/core/uibase/web/wfrmsh.cxx | 56
sw/source/core/uibase/web/wgrfsh.cxx | 61
sw/source/core/uibase/web/wlistsh.cxx | 55
sw/source/core/uibase/web/wolesh.cxx | 56
sw/source/core/uibase/web/wtabsh.cxx | 61
sw/source/core/uibase/web/wtextsh.cxx | 64
sw/source/core/uibase/web/wview.cxx | 288
sw/source/core/uibase/wrtsh/delete.cxx | 543 +
sw/source/core/uibase/wrtsh/move.cxx | 693 +
sw/source/core/uibase/wrtsh/navmgr.cxx | 228
sw/source/core/uibase/wrtsh/select.cxx | 973 ++
sw/source/core/uibase/wrtsh/wrtsh.hrc | 41
sw/source/core/uibase/wrtsh/wrtsh.src | 46
sw/source/core/uibase/wrtsh/wrtsh1.cxx | 1801 ++++
sw/source/core/uibase/wrtsh/wrtsh2.cxx | 542 +
sw/source/core/uibase/wrtsh/wrtsh3.cxx | 227
sw/source/core/uibase/wrtsh/wrtsh4.cxx | 238
sw/source/core/uibase/wrtsh/wrtundo.cxx | 154
sw/source/core/view/viewsh.cxx | 2
sw/source/ui/app/appenv.cxx | 508 -
sw/source/ui/app/apphdl.cxx | 888 --
sw/source/ui/app/applab.cxx | 403
sw/source/ui/app/appopt.cxx | 560 -
sw/source/ui/app/docsh.cxx | 1327 ---
sw/source/ui/app/docsh2.cxx | 1586 ---
sw/source/ui/app/docshdrw.cxx | 54
sw/source/ui/app/docshini.cxx | 682 -
sw/source/ui/app/docst.cxx | 1255 --
sw/source/ui/app/docstyle.cxx | 2973 ------
sw/source/ui/app/mainwn.cxx | 141
sw/source/ui/app/swdll.cxx | 164
sw/source/ui/app/swdllimpl.hxx | 36
sw/source/ui/app/swmodul1.cxx | 659 -
sw/source/ui/app/swmodule.cxx | 427
sw/source/ui/app/swwait.cxx | 84
sw/source/ui/cctrl/actctrl.cxx | 134
sw/source/ui/cctrl/popbox.cxx | 63
sw/source/ui/cctrl/swlbox.cxx | 137
sw/source/ui/chrdlg/ccoll.cxx | 187
sw/source/ui/config/barcfg.cxx | 127
sw/source/ui/config/caption.cxx | 76
sw/source/ui/config/cfgitems.cxx | 358
sw/source/ui/config/dbconfig.cxx | 120
sw/source/ui/config/fontcfg.cxx | 320
sw/source/ui/config/modcfg.cxx | 1398 ---
sw/source/ui/config/prtopt.cxx | 175
sw/source/ui/config/uinums.cxx | 567 -
sw/source/ui/config/usrpref.cxx | 592 -
sw/source/ui/config/viewopt.cxx | 550 -
sw/source/ui/dbui/dbmgr.cxx | 2960 ------
sw/source/ui/dbui/dbtree.cxx | 524 -
sw/source/ui/dbui/dbui.cxx | 87
sw/source/ui/dbui/maildispatcher.cxx | 275
sw/source/ui/dbui/mailmergechildwindow.cxx | 666 -
sw/source/ui/dbui/mailmergechildwindow.hrc | 47
sw/source/ui/dbui/mailmergechildwindow.src | 210
sw/source/ui/dbui/mailmergehelper.cxx | 906 --
sw/source/ui/dbui/mmconfigitem.cxx | 1739 ---
sw/source/ui/dbui/swdbtoolsclient.cxx | 232
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 843 -
sw/source/ui/dialog/regionsw.cxx | 242
sw/source/ui/dialog/regionsw.hrc | 42
sw/source/ui/dialog/regionsw.src | 119
sw/source/ui/dialog/swabstdlg.cxx | 59
sw/source/ui/dialog/swdlgfact.cxx | 2
sw/source/ui/dialog/swwrtshitem.cxx | 43
sw/source/ui/dialog/uiregionsw.cxx | 2
sw/source/ui/dialog/wordcountwrapper.cxx | 49
sw/source/ui/dochdl/gloshdl.cxx | 753 -
sw/source/ui/dochdl/swdtflvr.cxx | 3783 --------
sw/source/ui/docvw/AnchorOverlayObject.cxx | 449 -
sw/source/ui/docvw/AnchorOverlayObject.hxx | 133
sw/source/ui/docvw/AnnotationMenuButton.cxx | 203
sw/source/ui/docvw/AnnotationMenuButton.hxx | 53
sw/source/ui/docvw/AnnotationWin.cxx | 318
sw/source/ui/docvw/DashedLine.cxx | 97
sw/source/ui/docvw/FrameControlsManager.cxx | 159
sw/source/ui/docvw/HeaderFooterWin.cxx | 520 -
sw/source/ui/docvw/OverlayRanges.cxx | 180
sw/source/ui/docvw/OverlayRanges.hxx | 78
sw/source/ui/docvw/PageBreakWin.cxx | 463 -
sw/source/ui/docvw/PostItMgr.cxx | 1939 ----
sw/source/ui/docvw/ShadowOverlayObject.cxx | 252
sw/source/ui/docvw/ShadowOverlayObject.hxx | 70
sw/source/ui/docvw/SidebarTxtControl.cxx | 408
sw/source/ui/docvw/SidebarTxtControl.hxx | 75
sw/source/ui/docvw/SidebarTxtControlAcc.cxx | 293
sw/source/ui/docvw/SidebarTxtControlAcc.hxx | 46
sw/source/ui/docvw/SidebarWin.cxx | 1354 ---
sw/source/ui/docvw/SidebarWinAcc.cxx | 143
sw/source/ui/docvw/SidebarWinAcc.hxx | 57
sw/source/ui/docvw/annotation.hrc | 45
sw/source/ui/docvw/docvw.hrc | 91
sw/source/ui/docvw/docvw.src | 307
sw/source/ui/docvw/edtdd.cxx | 495 -
sw/source/ui/docvw/edtwin.cxx | 6157 --------------
sw/source/ui/docvw/edtwin2.cxx | 526 -
sw/source/ui/docvw/edtwin3.cxx | 193
sw/source/ui/docvw/frmsidebarwincontainer.cxx | 204
sw/source/ui/docvw/frmsidebarwincontainer.hxx | 63
sw/source/ui/docvw/romenu.cxx | 368
sw/source/ui/docvw/romenu.hxx | 64
sw/source/ui/docvw/srcedtw.cxx | 993 --
sw/source/ui/envelp/envimg.cxx | 355
sw/source/ui/envelp/label.hrc | 42
sw/source/ui/envelp/label1.cxx | 4
sw/source/ui/envelp/labelcfg.cxx | 358
sw/source/ui/envelp/labfmt.cxx | 4
sw/source/ui/envelp/labimg.cxx | 473 -
sw/source/ui/envelp/labimp.hxx | 114
sw/source/ui/envelp/swuilabimp.hxx | 2
sw/source/ui/envelp/syncbtn.cxx | 82
sw/source/ui/fldui/fldmgr.cxx | 1773 ----
sw/source/ui/fldui/fldwrap.cxx | 161
sw/source/ui/fldui/xfldui.cxx | 168
sw/source/ui/frmdlg/colex.cxx | 589 -
sw/source/ui/frmdlg/colmgr.cxx | 150
sw/source/ui/frmdlg/frmmgr.cxx | 608 -
sw/source/ui/globdoc/globdoc.cxx | 73
sw/source/ui/inc/DashedLine.hxx | 30
sw/source/ui/inc/DropDownFieldDialog.hxx | 58
sw/source/ui/inc/FrameControl.hxx | 53
sw/source/ui/inc/FrameControlsManager.hxx | 56
sw/source/ui/inc/HeaderFooterWin.hxx | 58
sw/source/ui/inc/PageBreakWin.hxx | 63
sw/source/ui/inc/SidebarWindowsConsts.hxx | 31
sw/source/ui/inc/SwSpellDialogChildWindow.hxx | 67
sw/source/ui/inc/SwXFilterOptions.hxx | 101
sw/source/ui/inc/abstract.hxx | 42
sw/source/ui/inc/actctrl.hxx | 92
sw/source/ui/inc/addrdlg.hxx | 32
sw/source/ui/inc/annotsh.hxx | 74
sw/source/ui/inc/app.hrc | 118
sw/source/ui/inc/ascfldlg.hxx | 62
sw/source/ui/inc/autoedit.hxx | 37
sw/source/ui/inc/barcfg.hxx | 41
sw/source/ui/inc/basesh.hxx | 115
sw/source/ui/inc/beziersh.hxx | 38
sw/source/ui/inc/bmpwin.hxx | 56
sw/source/ui/inc/bookctrl.hxx | 47
sw/source/ui/inc/bookmark.hxx | 70
sw/source/ui/inc/break.hxx | 75
sw/source/ui/inc/caption.hxx | 98
sw/source/ui/inc/cfgid.h | 28
sw/source/ui/inc/cfgitems.hxx | 221
sw/source/ui/inc/changedb.hxx | 68
sw/source/ui/inc/chartins.hxx | 27
sw/source/ui/inc/chldwrap.hxx | 47
sw/source/ui/inc/chrdlg.hxx | 94
sw/source/ui/inc/chrdlgmodes.hxx | 21
sw/source/ui/inc/cnttab.hxx | 88
sw/source/ui/inc/colex.hxx | 109
sw/source/ui/inc/colmgr.hxx | 127
sw/source/ui/inc/column.hxx | 206
sw/source/ui/inc/conarc.hxx | 48
sw/source/ui/inc/concustomshape.hxx | 63
sw/source/ui/inc/condedit.hxx | 49
sw/source/ui/inc/conform.hxx | 38
sw/source/ui/inc/conpoly.hxx | 47
sw/source/ui/inc/conrect.hxx | 51
sw/source/ui/inc/content.hxx | 208
sw/source/ui/inc/conttree.hxx | 329
sw/source/ui/inc/convert.hxx | 74
sw/source/ui/inc/cption.hxx | 113
sw/source/ui/inc/dbconfig.hxx | 47
sw/source/ui/inc/dbinsdlg.hxx | 171
sw/source/ui/inc/dbtree.hxx | 72
sw/source/ui/inc/dbui.hxx | 70
sw/source/ui/inc/dialmgr.hxx | 31
sw/source/ui/inc/docfnote.hxx | 44
sw/source/ui/inc/docstdlg.hxx | 70
sw/source/ui/inc/drawbase.hxx | 79
sw/source/ui/inc/drawsh.hxx | 50
sw/source/ui/inc/drformsh.hxx | 41
sw/source/ui/inc/drpcps.hxx | 103
sw/source/ui/inc/drwbassh.hxx | 56
sw/source/ui/inc/drwtxtsh.hxx | 80
sw/source/ui/inc/dselect.hxx | 43
sw/source/ui/inc/edtwin.hxx | 302
sw/source/ui/inc/envimg.hxx | 91
sw/source/ui/inc/envlop.hxx | 122
sw/source/ui/inc/fldedt.hxx | 55
sw/source/ui/inc/fldmgr.hxx | 217
sw/source/ui/inc/fldtdlg.hxx | 66
sw/source/ui/inc/fldwrap.hxx | 56
sw/source/ui/inc/fontcfg.hxx | 112
sw/source/ui/inc/formatclipboard.hxx | 95
sw/source/ui/inc/formedt.hxx | 92
sw/source/ui/inc/frmdlg.hxx | 68
sw/source/ui/inc/frmmgr.hxx | 188
sw/source/ui/inc/frmpage.hxx | 328
sw/source/ui/inc/frmsh.hxx | 44
sw/source/ui/inc/frmui.hrc | 71
sw/source/ui/inc/globals.h | 31
sw/source/ui/inc/globdoc.hrc | 44
sw/source/ui/inc/glosbib.hxx | 116
sw/source/ui/inc/glosdoc.hxx | 135
sw/source/ui/inc/gloshdl.hxx | 104
sw/source/ui/inc/gloslst.hxx | 82
sw/source/ui/inc/glossary.hxx | 168
sw/source/ui/inc/glshell.hxx | 85
sw/source/ui/inc/grfsh.hxx | 41
sw/source/ui/inc/hyp.hxx | 58
sw/source/ui/inc/idxmrk.hxx | 60
sw/source/ui/inc/imaildsplistener.hxx | 70
sw/source/ui/inc/initui.hxx | 66
sw/source/ui/inc/inpdlg.hxx | 63
sw/source/ui/inc/inputwin.hxx | 119
sw/source/ui/inc/insfnote.hxx | 85
sw/source/ui/inc/instable.hxx | 76
sw/source/ui/inc/javaedit.hxx | 88
sw/source/ui/inc/label.hxx | 93
sw/source/ui/inc/labelcfg.hxx | 61
sw/source/ui/inc/labimg.hxx | 125
sw/source/ui/inc/langhelper.hxx | 62
sw/source/ui/inc/linenum.hxx | 64
sw/source/ui/inc/listsh.hxx | 38
sw/source/ui/inc/macassgn.hxx | 47
sw/source/ui/inc/mailconfigpage.hxx | 77
sw/source/ui/inc/maildispatcher.hxx | 154
sw/source/ui/inc/mailmergechildwindow.hxx | 52
sw/source/ui/inc/mailmergehelper.hxx | 310
sw/source/ui/inc/mailmergewizard.hxx | 97
sw/source/ui/inc/mailmrge.hxx | 176
sw/source/ui/inc/mediash.hxx | 37
sw/source/ui/inc/mergetbl.hxx | 41
sw/source/ui/inc/misc.hrc | 60
sw/source/ui/inc/mmconfigitem.hxx | 270
sw/source/ui/inc/multmrk.hxx | 53
sw/source/ui/inc/navicfg.hxx | 109
sw/source/ui/inc/navicont.hxx | 54
sw/source/ui/inc/navipi.hxx | 186
sw/source/ui/inc/navmgr.hxx | 56
sw/source/ui/inc/navsh.hxx | 28
sw/source/ui/inc/num.hxx | 166
sw/source/ui/inc/numberingtypelistbox.hxx | 51
sw/source/ui/inc/numfmtlb.hxx | 73
sw/source/ui/inc/numpara.hxx | 86
sw/source/ui/inc/numprevw.hxx | 71
sw/source/ui/inc/olesh.hxx | 35
sw/source/ui/inc/olmenu.hxx | 91
sw/source/ui/inc/optcomp.hxx | 75
sw/source/ui/inc/optload.hxx | 175
sw/source/ui/inc/optpage.hxx | 439
sw/source/ui/inc/outline.hxx | 138
sw/source/ui/inc/pardlg.hxx | 30
sw/source/ui/inc/pattern.hxx | 36
sw/source/ui/inc/pgfnote.hxx | 77
sw/source/ui/inc/pggrid.hxx | 101
sw/source/ui/inc/popbox.hxx | 57
sw/source/ui/inc/popup.hrc | 49
sw/source/ui/inc/prcntfld.hxx | 111
sw/source/ui/inc/pview.hxx | 301
sw/source/ui/inc/redline_tmpl.hrc | 39
sw/source/ui/inc/redlndlg.hxx | 162
sw/source/ui/inc/regionsw.hxx | 303
sw/source/ui/inc/ribbar.hrc | 104
sw/source/ui/inc/rowht.hxx | 44
sw/source/ui/inc/scroll.hxx | 59
sw/source/ui/inc/selglos.hxx | 54
sw/source/ui/inc/sharedconnection.hxx | 30
sw/source/ui/inc/shdwcrsr.hxx | 57
sw/source/ui/inc/shells.hrc | 100
sw/source/ui/inc/splittbl.hxx | 49
sw/source/ui/inc/srcedtw.hxx | 157
sw/source/ui/inc/srcview.hxx | 89
sw/source/ui/inc/srtdlg.hxx | 92
sw/source/ui/inc/stmenu.hxx | 74
sw/source/ui/inc/swcont.hxx | 99
sw/source/ui/inc/swdtflvr.hxx | 213
sw/source/ui/inc/swlbox.hxx | 86
sw/source/ui/inc/swmessdialog.hxx | 30
sw/source/ui/inc/swmodalredlineacceptdlg.hxx | 40
sw/source/ui/inc/swrenamexnameddlg.hxx | 69
sw/source/ui/inc/swruler.hxx | 122
sw/source/ui/inc/swtablerep.hxx | 84
sw/source/ui/inc/swuiccoll.hxx | 75
sw/source/ui/inc/swuicnttab.hxx | 497 -
sw/source/ui/inc/swuiidxmrk.hxx | 253
sw/source/ui/inc/swuipardlg.hxx | 53
sw/source/ui/inc/swvset.hxx | 32
sw/source/ui/inc/swwrtshitem.hxx | 45
sw/source/ui/inc/syncbtn.hxx | 53
sw/source/ui/inc/table.hrc | 37
sw/source/ui/inc/tabledlg.hxx | 49
sw/source/ui/inc/tablemgr.hxx | 88
sw/source/ui/inc/tabsh.hxx | 52
sw/source/ui/inc/tautofmt.hxx | 91
sw/source/ui/inc/tblctrl.hxx | 40
sw/source/ui/inc/tblnumfm.hxx | 35
sw/source/ui/inc/tbxanchr.hxx | 42
sw/source/ui/inc/textsh.hxx | 83
sw/source/ui/inc/titlepage.hxx | 70
sw/source/ui/inc/tmpdlg.hxx | 89
sw/source/ui/inc/tmplctrl.hxx | 45
sw/source/ui/inc/toolbox.hrc | 553 -
sw/source/ui/inc/toxmgr.hxx | 310
sw/source/ui/inc/uiborder.hxx | 41
sw/source/ui/inc/uiitems.hxx | 119
sw/source/ui/inc/uinums.hxx | 123
sw/source/ui/inc/uitool.hxx | 109
sw/source/ui/inc/uivwimp.hxx | 173
sw/source/ui/inc/unoatxt.hxx | 283
sw/source/ui/inc/unodispatch.hxx | 128
sw/source/ui/inc/unomailmerge.hxx | 191
sw/source/ui/inc/unomod.hxx | 161
sw/source/ui/inc/unotools.hxx | 121
sw/source/ui/inc/unotxvw.hxx | 338
sw/source/ui/inc/usrpref.hxx | 276
sw/source/ui/inc/utlui.hrc | 189
sw/source/ui/inc/view.hxx | 689 -
sw/source/ui/inc/viewlayoutctrl.hxx | 46
sw/source/ui/inc/web.hrc | 47
sw/source/ui/inc/wformsh.hxx | 36
sw/source/ui/inc/wfrmsh.hxx | 38
sw/source/ui/inc/wgrfsh.hxx | 36
sw/source/ui/inc/wlistsh.hxx | 36
sw/source/ui/inc/wolesh.hxx | 35
sw/source/ui/inc/wordcountctrl.hxx | 33
sw/source/ui/inc/wordcountdialog.hxx | 79
sw/source/ui/inc/workctrl.hxx | 185
sw/source/ui/inc/wrap.hxx | 117
sw/source/ui/inc/wrtsh.hxx | 646 -
sw/source/ui/inc/wtabsh.hxx | 36
sw/source/ui/inc/wtextsh.hxx | 38
sw/source/ui/inc/wview.hxx | 41
sw/source/ui/inc/zoomctrl.hxx | 43
sw/source/ui/index/idxmrk.cxx | 114
sw/source/ui/index/idxmrk.hrc | 26
sw/source/ui/index/swuiidxmrk.cxx | 2
sw/source/ui/index/toxmgr.cxx | 525 -
sw/source/ui/lingu/hhcwrp.cxx | 720 -
sw/source/ui/lingu/hyp.cxx | 132
sw/source/ui/lingu/olmenu.cxx | 891 --
sw/source/ui/lingu/olmenu.hrc | 89
sw/source/ui/lingu/olmenu.src | 131
sw/source/ui/lingu/sdrhhcwrap.cxx | 175
sw/source/ui/lingu/sdrhhcwrap.hxx | 56
sw/source/ui/misc/glosdoc.cxx | 693 -
sw/source/ui/misc/glshell.cxx | 274
sw/source/ui/misc/numberingtypelistbox.cxx | 164
sw/source/ui/misc/redlndlg.cxx | 1210 --
sw/source/ui/misc/redlndlg.hrc | 28
sw/source/ui/misc/redlndlg.src | 85
sw/source/ui/misc/swruler.cxx | 302
sw/source/ui/ribbar/conarc.cxx | 102
sw/source/ui/ribbar/concustomshape.cxx | 196
sw/source/ui/ribbar/conform.cxx | 110
sw/source/ui/ribbar/conpoly.cxx | 107
sw/source/ui/ribbar/conrect.cxx | 187
sw/source/ui/ribbar/drawbase.cxx | 623 -
sw/source/ui/ribbar/dselect.cxx | 72
sw/source/ui/ribbar/inputwin.cxx | 636 -
sw/source/ui/ribbar/inputwin.hrc | 62
sw/source/ui/ribbar/inputwin.src | 290
sw/source/ui/ribbar/tblctrl.cxx | 55
sw/source/ui/ribbar/tbxanchr.cxx | 124
sw/source/ui/ribbar/workctrl.cxx | 775 -
sw/source/ui/ribbar/workctrl.hrc | 75
sw/source/ui/ribbar/workctrl.src | 382
sw/source/ui/shells/annotsh.cxx | 1760 ----
sw/source/ui/shells/basesh.cxx | 2832 ------
sw/source/ui/shells/beziersh.cxx | 330
sw/source/ui/shells/drawdlg.cxx | 234
sw/source/ui/shells/drawsh.cxx | 597 -
sw/source/ui/shells/drformsh.cxx | 258
sw/source/ui/shells/drwbassh.cxx | 961 --
sw/source/ui/shells/drwtxtex.cxx | 1084 --
sw/source/ui/shells/drwtxtsh.cxx | 878 -
sw/source/ui/shells/frmsh.cxx | 1185 --
sw/source/ui/shells/grfsh.cxx | 892 --
sw/source/ui/shells/grfshex.cxx | 154
sw/source/ui/shells/langhelper.cxx | 612 -
sw/source/ui/shells/listsh.cxx | 280
sw/source/ui/shells/mediash.cxx | 199
sw/source/ui/shells/navsh.cxx | 106
sw/source/ui/shells/olesh.cxx | 55
sw/source/ui/shells/slotadd.cxx | 139
sw/source/ui/shells/tabsh.cxx | 1476 ---
sw/source/ui/shells/textdrw.cxx | 122
sw/source/ui/shells/textfld.cxx | 923 --
sw/source/ui/shells/textglos.cxx | 129
sw/source/ui/shells/textidx.cxx | 251
sw/source/ui/shells/textsh.cxx | 1131 --
sw/source/ui/shells/textsh1.cxx | 1811 ----
sw/source/ui/shells/textsh2.cxx | 285
sw/source/ui/shells/txtattr.cxx | 743 -
sw/source/ui/shells/txtcrsr.cxx | 376
sw/source/ui/shells/txtnum.cxx | 410
sw/source/ui/sidebar/PageColumnControl.cxx | 110
sw/source/ui/sidebar/PageColumnControl.hxx | 65
sw/source/ui/sidebar/PageMarginControl.cxx | 518 -
sw/source/ui/sidebar/PageMarginControl.hxx | 121
sw/source/ui/sidebar/PageOrientationControl.cxx | 90
sw/source/ui/sidebar/PageOrientationControl.hxx | 56
sw/source/ui/sidebar/PagePropertyPanel.cxx | 742 -
sw/source/ui/sidebar/PagePropertyPanel.hrc | 188
sw/source/ui/sidebar/PagePropertyPanel.hxx | 223
sw/source/ui/sidebar/PageSizeControl.cxx | 177
sw/source/ui/sidebar/PageSizeControl.hxx | 71
sw/source/ui/sidebar/PropertyPanel.hrc | 35
sw/source/ui/sidebar/SwPanelFactory.cxx | 148
sw/source/ui/sidebar/WrapPropertyPanel.cxx | 243
sw/source/ui/sidebar/WrapPropertyPanel.hxx | 88
sw/source/ui/smartmenu/stmenu.cxx | 170
sw/source/ui/smartmenu/stmenu.hrc | 33
sw/source/ui/smartmenu/stmenu.src | 37
sw/source/ui/table/chartins.cxx | 254
sw/source/ui/table/swtablerep.cxx | 186
sw/source/ui/table/tabledlg.cxx | 2
sw/source/ui/table/tablemgr.cxx | 349
sw/source/ui/table/tablepg.hxx | 195
sw/source/ui/uiview/formatclipboard.cxx | 608 -
sw/source/ui/uiview/pview.cxx | 1909 ----
sw/source/ui/uiview/scroll.cxx | 121
sw/source/ui/uiview/srcview.cxx | 873 -
sw/source/ui/uiview/swcli.cxx | 172
sw/source/ui/uiview/uivwimp.cxx | 305
sw/source/ui/uiview/view.cxx | 1822 ----
sw/source/ui/uiview/view.hrc | 74
sw/source/ui/uiview/view.src | 149
sw/source/ui/uiview/view0.cxx | 581 -
sw/source/ui/uiview/view1.cxx | 185
sw/source/ui/uiview/view2.cxx | 2469 -----
sw/source/ui/uiview/viewcoll.cxx | 80
sw/source/ui/uiview/viewdlg.cxx | 75
sw/source/ui/uiview/viewdlg2.cxx | 202
sw/source/ui/uiview/viewdraw.cxx | 755 -
sw/source/ui/uiview/viewfunc.hxx | 53
sw/source/ui/uiview/viewling.cxx | 898 --
sw/source/ui/uiview/viewmdi.cxx | 614 -
sw/source/ui/uiview/viewport.cxx | 1275 --
sw/source/ui/uiview/viewprt.cxx | 306
sw/source/ui/uiview/viewsrch.cxx | 814 -
sw/source/ui/uiview/viewstat.cxx | 526 -
sw/source/ui/uiview/viewtab.cxx | 2010 ----
sw/source/ui/uno/SwXDocumentSettings.cxx | 1254 --
sw/source/ui/uno/SwXDocumentSettings.hxx | 93
sw/source/ui/uno/SwXFilterOptions.cxx | 179
sw/source/ui/uno/dlelstnr.cxx | 165
sw/source/ui/uno/unoatxt.cxx | 1121 --
sw/source/ui/uno/unodefaults.cxx | 51
sw/source/ui/uno/unodefaults.hxx | 40
sw/source/ui/uno/unodispatch.cxx | 392
sw/source/ui/uno/unodoc.cxx | 113
sw/source/ui/uno/unofreg.cxx | 373
sw/source/ui/uno/unomailmerge.cxx | 1227 --
sw/source/ui/uno/unomod.cxx | 990 --
sw/source/ui/uno/unomodule.cxx | 154
sw/source/ui/uno/unomodule.hxx | 81
sw/source/ui/uno/unotxdoc.cxx | 3994 ---------
sw/source/ui/uno/unotxvw.cxx | 1851 ----
sw/source/ui/utlui/attrdesc.cxx | 1248 --
sw/source/ui/utlui/attrdesc.hrc | 115
sw/source/ui/utlui/attrdesc.src | 363
sw/source/ui/utlui/bookctrl.cxx | 128
sw/source/ui/utlui/condedit.cxx | 90
sw/source/ui/utlui/content.cxx | 3517 -------
sw/source/ui/utlui/glbltree.cxx | 1374 ---
sw/source/ui/utlui/gloslst.cxx | 418
sw/source/ui/utlui/initui.cxx | 337
sw/source/ui/utlui/initui.hrc | 57
sw/source/ui/utlui/initui.src | 412
sw/source/ui/utlui/navicfg.cxx | 119
sw/source/ui/utlui/navipi.cxx | 1384 ---
sw/source/ui/utlui/navipi.hrc | 74
sw/source/ui/utlui/navipi.src | 508 -
sw/source/ui/utlui/numfmtlb.cxx | 488 -
sw/source/ui/utlui/prcntfld.cxx | 287
sw/source/ui/utlui/shdwcrsr.cxx | 120
sw/source/ui/utlui/swrenamexnameddlg.cxx | 2
sw/source/ui/utlui/tmplctrl.cxx | 137
sw/source/ui/utlui/uiitems.cxx | 317
sw/source/ui/utlui/uitool.cxx | 818 -
sw/source/ui/utlui/unotools.cxx | 562 -
sw/source/ui/utlui/unotools.hrc | 35
sw/source/ui/utlui/unotools.src | 42
sw/source/ui/utlui/viewlayoutctrl.cxx | 195
sw/source/ui/utlui/wordcountctrl.cxx | 27
sw/source/ui/utlui/zoomctrl.cxx | 72
sw/source/ui/web/wdocsh.cxx | 86
sw/source/ui/web/wformsh.cxx | 56
sw/source/ui/web/wfrmsh.cxx | 56
sw/source/ui/web/wgrfsh.cxx | 61
sw/source/ui/web/wlistsh.cxx | 55
sw/source/ui/web/wolesh.cxx | 56
sw/source/ui/web/wtabsh.cxx | 61
sw/source/ui/web/wtextsh.cxx | 64
sw/source/ui/web/wview.cxx | 288
sw/source/ui/wrtsh/delete.cxx | 543 -
sw/source/ui/wrtsh/move.cxx | 693 -
sw/source/ui/wrtsh/navmgr.cxx | 228
sw/source/ui/wrtsh/select.cxx | 973 --
sw/source/ui/wrtsh/wrtsh.hrc | 41
sw/source/ui/wrtsh/wrtsh.src | 46
sw/source/ui/wrtsh/wrtsh1.cxx | 1801 ----
sw/source/ui/wrtsh/wrtsh2.cxx | 542 -
sw/source/ui/wrtsh/wrtsh3.cxx | 227
sw/source/ui/wrtsh/wrtsh4.cxx | 238
sw/source/ui/wrtsh/wrtundo.cxx | 154
965 files changed, 155830 insertions(+), 155820 deletions(-)
New commits:
commit a652ea0fc4cc789f715b461819127ee80afa9e6f
Author: roopak12345 <mailstorpk at gmail.com>
Date: Sun Mar 9 21:40:44 2014 +0100
fdo#70422 Moved the linked files from sw/source/ui to a new core/uibase dir
Moved the files linked in sw/Library_sw.mk from sw/source/ui to
sw/source/core/uibase and modified the make files as per the new
directory location.
Reviewed on:
https://gerrit.libreoffice.org/8447
Change-Id: I05f6ccdeee5e76fb0ae477d16721d9ddc6eaff32
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index aaf690c..e9ab70e 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -33,6 +33,11 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
$$(INCLUDE) \
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/core/uibase/inc \
+ -I$(SRCDIR)/sw/source/core/uibase/docvw \
+ -I$(SRCDIR)/sw/source/core/uibase/envelp \
+ -I$(SRCDIR)/sw/source/core/uibase/index \
+ -I$(SRCDIR)/sw/source/core/uibase/sidebar \
-I$(SRCDIR)/sw/source/core/undo \
-I$(SRCDIR)/sw/source/core/unocore \
-I$(SRCDIR)/sw/source/ui/chrdlg \
@@ -65,6 +70,20 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/core/layout/pagefrm.src \
sw/source/core/undo/undo.src \
sw/source/core/unocore/unocore.src \
+ sw/source/core/uibase/dialog/regionsw.src \
+ sw/source/core/uibase/docvw/docvw.src \
+ sw/source/core/uibase/lingu/olmenu.src \
+ sw/source/core/uibase/misc/redlndlg.src \
+ sw/source/core/uibase/ribbar/inputwin.src \
+ sw/source/core/uibase/ribbar/workctrl.src \
+ sw/source/core/uibase/smartmenu/stmenu.src \
+ sw/source/core/uibase/uiview/view.src \
+ sw/source/core/uibase/utlui/attrdesc.src \
+ sw/source/core/uibase/utlui/navipi.src \
+ sw/source/core/uibase/utlui/initui.src \
+ sw/source/core/uibase/wrtsh/wrtsh.src \
+ sw/source/core/uibase/utlui/unotools.src \
+ sw/source/core/uibase/dbui/mailmergechildwindow.src \
sw/source/ui/app/app.src \
sw/source/ui/app/error.src \
sw/source/ui/app/mn.src \
@@ -74,7 +93,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/dbui/createaddresslistdialog.src \
sw/source/ui/dbui/dbtablepreviewdialog.src \
sw/source/ui/dbui/dbui.src \
- sw/source/ui/dbui/mailmergechildwindow.src \
sw/source/ui/dbui/mailmergewizard.src \
sw/source/ui/dbui/mmaddressblockpage.src \
sw/source/ui/dbui/mmgreetingspage.src \
@@ -84,11 +102,9 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/dbui/mmpreparemergepage.src \
sw/source/ui/dbui/selectdbtabledialog.src \
sw/source/ui/dialog/dialog.src \
- sw/source/ui/dialog/regionsw.src \
sw/source/ui/dochdl/dochdl.src \
sw/source/ui/docvw/annotation.src \
sw/source/ui/docvw/access.src \
- sw/source/ui/docvw/docvw.src \
sw/source/ui/envelp/envelp.src \
sw/source/ui/envelp/label.src \
sw/source/ui/envelp/labfmt.src \
@@ -98,29 +114,18 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/globdoc/globdoc.src \
sw/source/ui/index/cnttab.src \
sw/source/ui/index/idxmrk.src \
- sw/source/ui/lingu/olmenu.src \
sw/source/ui/misc/glossary.src \
sw/source/ui/misc/numberingtypelistbox.src \
- sw/source/ui/misc/redlndlg.src \
sw/source/ui/misc/srtdlg.src \
sw/source/ui/misc/swruler.src \
- sw/source/ui/ribbar/inputwin.src \
sw/source/ui/ribbar/tbxanchr.src \
- sw/source/ui/ribbar/workctrl.src \
sw/source/ui/shells/shells.src \
sw/source/ui/sidebar/PagePropertyPanel.src \
- sw/source/ui/smartmenu/stmenu.src \
sw/source/ui/table/table.src \
sw/source/ui/table/tabledlg.src \
- sw/source/ui/uiview/view.src \
- sw/source/ui/utlui/attrdesc.src \
- sw/source/ui/utlui/initui.src \
- sw/source/ui/utlui/navipi.src \
sw/source/ui/utlui/poolfmt.src \
- sw/source/ui/utlui/unotools.src \
sw/source/ui/utlui/utlui.src \
sw/source/ui/web/web.src \
- sw/source/ui/wrtsh/wrtsh.src \
))
$(eval $(call gb_SrsTarget_add_nonlocalizable_files,sw/res,\
@@ -128,7 +133,7 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,sw/res,\
))
$(eval $(call gb_SrsTarget_add_templates,sw/res,\
- sw/source/ui/inc/redline_tmpl.hrc \
+ sw/source/core/uibase/inc/redline_tmpl.hrc \
))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 2da0c3f..18b4afd 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/core/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
$$(INCLUDE) \
))
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index a37b438..e61967a 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_odfimport,\
$(eval $(call gb_CppunitTest_set_include,sw_odfimport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/core/uibase/inc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
$$(INCLUDE) \
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index cbe54c1..376d361 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_uiwriter,\
$(eval $(call gb_CppunitTest_set_include,sw_uiwriter,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/core/uibase/inc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
$$(INCLUDE) \
diff --git a/sw/Executable_tiledrendering.mk b/sw/Executable_tiledrendering.mk
index e174950..b66092d 100644
--- a/sw/Executable_tiledrendering.mk
+++ b/sw/Executable_tiledrendering.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_Executable_use_api,tiledrendering,\
$(eval $(call gb_Executable_set_include,tiledrendering,\
-I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/ui/inc \
+ -I$(SRCDIR)/sw/source/core/uibase/inc \
$$(INCLUDE) \
))
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index ff77482..cbdb192 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompi
$(eval $(call gb_Library_set_include,sw,\
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/filter/inc \
- -I$(SRCDIR)/sw/source/ui/inc \
+ -I$(SRCDIR)/sw/source/core/uibase/inc \
-I$(SRCDIR)/sw/inc \
-I$(WORKDIR)/SdiTarget/sw/sdi \
$$(INCLUDE) \
@@ -533,219 +533,219 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/filter/xml/xmltext \
sw/source/filter/xml/xmltexte \
sw/source/filter/xml/xmltexti \
- sw/source/ui/app/appenv \
- sw/source/ui/app/apphdl \
- sw/source/ui/app/applab \
- sw/source/ui/app/appopt \
- sw/source/ui/app/docsh \
- sw/source/ui/app/docsh2 \
- sw/source/ui/app/docshdrw \
- sw/source/ui/app/docshini \
- sw/source/ui/app/docst \
- sw/source/ui/app/docstyle \
- sw/source/ui/app/mainwn \
- sw/source/ui/app/swdll \
- sw/source/ui/app/swmodul1 \
- sw/source/ui/app/swmodule \
- sw/source/ui/app/swwait \
- sw/source/ui/cctrl/actctrl \
- sw/source/ui/cctrl/popbox \
- sw/source/ui/cctrl/swlbox \
- sw/source/ui/chrdlg/ccoll \
- sw/source/ui/config/barcfg \
- sw/source/ui/config/caption \
- sw/source/ui/config/cfgitems \
- sw/source/ui/config/dbconfig \
- sw/source/ui/config/fontcfg \
- sw/source/ui/config/modcfg \
- sw/source/ui/config/prtopt \
- sw/source/ui/config/uinums \
- sw/source/ui/config/usrpref \
- sw/source/ui/config/viewopt \
- sw/source/ui/dialog/SwSpellDialogChildWindow \
- sw/source/ui/dialog/regionsw \
- sw/source/ui/dialog/swabstdlg \
- sw/source/ui/dialog/swwrtshitem \
- sw/source/ui/dochdl/gloshdl \
- sw/source/ui/dochdl/swdtflvr \
- sw/source/ui/docvw/AnchorOverlayObject \
- sw/source/ui/docvw/AnnotationMenuButton \
- sw/source/ui/docvw/AnnotationWin \
- sw/source/ui/docvw/DashedLine \
- sw/source/ui/docvw/FrameControlsManager \
- sw/source/ui/docvw/PageBreakWin \
- sw/source/ui/docvw/OverlayRanges \
- sw/source/ui/docvw/PostItMgr \
- sw/source/ui/docvw/ShadowOverlayObject \
- sw/source/ui/docvw/SidebarTxtControl \
- sw/source/ui/docvw/SidebarTxtControlAcc \
- sw/source/ui/docvw/SidebarWin \
- sw/source/ui/docvw/SidebarWinAcc \
- sw/source/ui/docvw/HeaderFooterWin \
- sw/source/ui/docvw/edtdd \
- sw/source/ui/docvw/edtwin \
- sw/source/ui/docvw/edtwin2 \
- sw/source/ui/docvw/edtwin3 \
- sw/source/ui/docvw/frmsidebarwincontainer \
- sw/source/ui/docvw/romenu \
- sw/source/ui/docvw/srcedtw \
- sw/source/ui/envelp/envimg \
- sw/source/ui/envelp/labelcfg \
- sw/source/ui/envelp/labimg \
- sw/source/ui/envelp/syncbtn \
- sw/source/ui/fldui/fldmgr \
- sw/source/ui/fldui/fldwrap \
- sw/source/ui/fldui/xfldui \
- sw/source/ui/frmdlg/colex \
- sw/source/ui/frmdlg/colmgr \
- sw/source/ui/frmdlg/frmmgr \
- sw/source/ui/globdoc/globdoc \
- sw/source/ui/index/idxmrk \
- sw/source/ui/dialog/wordcountwrapper \
- sw/source/ui/index/toxmgr \
- sw/source/ui/lingu/hhcwrp \
- sw/source/ui/lingu/hyp \
- sw/source/ui/lingu/olmenu \
- sw/source/ui/lingu/sdrhhcwrap \
- sw/source/ui/misc/glosdoc \
- sw/source/ui/misc/glshell \
- sw/source/ui/misc/numberingtypelistbox \
- sw/source/ui/misc/redlndlg \
- sw/source/ui/misc/swruler \
- sw/source/ui/ribbar/conarc \
- sw/source/ui/ribbar/concustomshape \
- sw/source/ui/ribbar/conform \
- sw/source/ui/ribbar/conpoly \
- sw/source/ui/ribbar/conrect \
- sw/source/ui/ribbar/drawbase \
- sw/source/ui/ribbar/dselect \
- sw/source/ui/ribbar/inputwin \
- sw/source/ui/ribbar/tblctrl \
- sw/source/ui/ribbar/tbxanchr \
- sw/source/ui/ribbar/workctrl \
- sw/source/ui/shells/annotsh \
- sw/source/ui/shells/basesh \
- sw/source/ui/shells/beziersh \
- sw/source/ui/shells/drawdlg \
- sw/source/ui/shells/drawsh \
- sw/source/ui/shells/drformsh \
- sw/source/ui/shells/drwbassh \
- sw/source/ui/shells/drwtxtex \
- sw/source/ui/shells/drwtxtsh \
- sw/source/ui/shells/frmsh \
- sw/source/ui/shells/grfsh \
- sw/source/ui/shells/grfshex \
- sw/source/ui/shells/langhelper \
- sw/source/ui/shells/listsh \
- sw/source/ui/shells/mediash \
- sw/source/ui/shells/navsh \
- sw/source/ui/shells/olesh \
- sw/source/ui/shells/slotadd \
- sw/source/ui/shells/tabsh \
- sw/source/ui/shells/textdrw \
- sw/source/ui/shells/textfld \
- sw/source/ui/shells/textglos \
- sw/source/ui/shells/textidx \
- sw/source/ui/shells/textsh \
- sw/source/ui/shells/textsh1 \
- sw/source/ui/shells/textsh2 \
- sw/source/ui/shells/txtattr \
- sw/source/ui/shells/txtcrsr \
- sw/source/ui/shells/txtnum \
- sw/source/ui/sidebar/PageOrientationControl \
- sw/source/ui/sidebar/PageMarginControl \
- sw/source/ui/sidebar/PageSizeControl \
- sw/source/ui/sidebar/PageColumnControl \
- sw/source/ui/sidebar/PagePropertyPanel \
- sw/source/ui/sidebar/WrapPropertyPanel \
- sw/source/ui/sidebar/SwPanelFactory \
- sw/source/ui/smartmenu/stmenu \
- sw/source/ui/table/chartins \
- sw/source/ui/table/swtablerep \
- sw/source/ui/table/tablemgr \
- sw/source/ui/uiview/formatclipboard \
- sw/source/ui/uiview/pview \
- sw/source/ui/uiview/scroll \
- sw/source/ui/uiview/srcview \
- sw/source/ui/uiview/swcli \
- sw/source/ui/uiview/uivwimp \
- sw/source/ui/uiview/view \
- sw/source/ui/uiview/view0 \
- sw/source/ui/uiview/view1 \
- sw/source/ui/uiview/view2 \
- sw/source/ui/uiview/viewcoll \
- sw/source/ui/uiview/viewdlg \
- sw/source/ui/uiview/viewdlg2 \
- sw/source/ui/uiview/viewdraw \
- sw/source/ui/uiview/viewling \
- sw/source/ui/uiview/viewmdi \
- sw/source/ui/uiview/viewport \
- sw/source/ui/uiview/viewprt \
- sw/source/ui/uiview/viewsrch \
- sw/source/ui/uiview/viewstat \
- sw/source/ui/uiview/viewtab \
- sw/source/ui/uno/SwXDocumentSettings \
- sw/source/ui/uno/SwXFilterOptions \
- sw/source/ui/uno/dlelstnr \
- sw/source/ui/uno/unoatxt \
- sw/source/ui/uno/unodefaults \
- sw/source/ui/uno/unodispatch \
- sw/source/ui/uno/unodoc \
- sw/source/ui/uno/unofreg \
- sw/source/ui/uno/unomailmerge \
- sw/source/ui/uno/unomod \
- sw/source/ui/uno/unomodule \
- sw/source/ui/uno/unotxdoc \
- sw/source/ui/uno/unotxvw \
- sw/source/ui/utlui/attrdesc \
- sw/source/ui/utlui/bookctrl \
- sw/source/ui/utlui/condedit \
- sw/source/ui/utlui/content \
- sw/source/ui/utlui/glbltree \
- sw/source/ui/utlui/gloslst \
- sw/source/ui/utlui/initui \
- sw/source/ui/utlui/navicfg \
- sw/source/ui/utlui/navipi \
- sw/source/ui/utlui/numfmtlb \
- sw/source/ui/utlui/prcntfld \
- sw/source/ui/utlui/shdwcrsr \
- sw/source/ui/utlui/tmplctrl \
- sw/source/ui/utlui/uiitems \
- sw/source/ui/utlui/uitool \
- sw/source/ui/utlui/unotools \
- sw/source/ui/utlui/viewlayoutctrl \
- sw/source/ui/utlui/wordcountctrl \
- sw/source/ui/utlui/zoomctrl \
- sw/source/ui/web/wdocsh \
- sw/source/ui/web/wformsh \
- sw/source/ui/web/wfrmsh \
- sw/source/ui/web/wgrfsh \
- sw/source/ui/web/wlistsh \
- sw/source/ui/web/wolesh \
- sw/source/ui/web/wtabsh \
- sw/source/ui/web/wtextsh \
- sw/source/ui/web/wview \
- sw/source/ui/wrtsh/delete \
- sw/source/ui/wrtsh/move \
- sw/source/ui/wrtsh/navmgr \
- sw/source/ui/wrtsh/select \
- sw/source/ui/wrtsh/wrtsh1 \
- sw/source/ui/wrtsh/wrtsh2 \
- sw/source/ui/wrtsh/wrtsh3 \
- sw/source/ui/wrtsh/wrtsh4 \
- sw/source/ui/wrtsh/wrtundo \
+ sw/source/core/uibase/app/appenv \
+ sw/source/core/uibase/app/apphdl \
+ sw/source/core/uibase/app/applab \
+ sw/source/core/uibase/app/appopt \
+ sw/source/core/uibase/app/docsh \
+ sw/source/core/uibase/app/docsh2 \
+ sw/source/core/uibase/app/docshdrw \
+ sw/source/core/uibase/app/docshini \
+ sw/source/core/uibase/app/docst \
+ sw/source/core/uibase/app/docstyle \
+ sw/source/core/uibase/app/mainwn \
+ sw/source/core/uibase/app/swdll \
+ sw/source/core/uibase/app/swmodul1 \
+ sw/source/core/uibase/app/swmodule \
+ sw/source/core/uibase/app/swwait \
+ sw/source/core/uibase/cctrl/actctrl \
+ sw/source/core/uibase/cctrl/popbox \
+ sw/source/core/uibase/cctrl/swlbox \
+ sw/source/core/uibase/chrdlg/ccoll \
+ sw/source/core/uibase/config/barcfg \
+ sw/source/core/uibase/config/caption \
+ sw/source/core/uibase/config/cfgitems \
+ sw/source/core/uibase/config/dbconfig \
+ sw/source/core/uibase/config/fontcfg \
+ sw/source/core/uibase/config/modcfg \
+ sw/source/core/uibase/config/prtopt \
+ sw/source/core/uibase/config/uinums \
+ sw/source/core/uibase/config/usrpref \
+ sw/source/core/uibase/config/viewopt \
+ sw/source/core/uibase/dialog/SwSpellDialogChildWindow \
+ sw/source/core/uibase/dialog/regionsw \
+ sw/source/core/uibase/dialog/swabstdlg \
+ sw/source/core/uibase/dialog/swwrtshitem \
+ sw/source/core/uibase/dochdl/gloshdl \
+ sw/source/core/uibase/dochdl/swdtflvr \
+ sw/source/core/uibase/docvw/AnchorOverlayObject \
+ sw/source/core/uibase/docvw/AnnotationMenuButton \
+ sw/source/core/uibase/docvw/AnnotationWin \
+ sw/source/core/uibase/docvw/DashedLine \
+ sw/source/core/uibase/docvw/FrameControlsManager \
+ sw/source/core/uibase/docvw/PageBreakWin \
+ sw/source/core/uibase/docvw/OverlayRanges \
+ sw/source/core/uibase/docvw/PostItMgr \
+ sw/source/core/uibase/docvw/ShadowOverlayObject \
+ sw/source/core/uibase/docvw/SidebarTxtControl \
+ sw/source/core/uibase/docvw/SidebarTxtControlAcc \
+ sw/source/core/uibase/docvw/SidebarWin \
+ sw/source/core/uibase/docvw/SidebarWinAcc \
+ sw/source/core/uibase/docvw/HeaderFooterWin \
+ sw/source/core/uibase/docvw/edtdd \
+ sw/source/core/uibase/docvw/edtwin \
+ sw/source/core/uibase/docvw/edtwin2 \
+ sw/source/core/uibase/docvw/edtwin3 \
+ sw/source/core/uibase/docvw/frmsidebarwincontainer \
+ sw/source/core/uibase/docvw/romenu \
+ sw/source/core/uibase/docvw/srcedtw \
+ sw/source/core/uibase/envelp/envimg \
+ sw/source/core/uibase/envelp/labelcfg \
+ sw/source/core/uibase/envelp/labimg \
+ sw/source/core/uibase/envelp/syncbtn \
+ sw/source/core/uibase/fldui/fldmgr \
+ sw/source/core/uibase/fldui/fldwrap \
+ sw/source/core/uibase/fldui/xfldui \
+ sw/source/core/uibase/frmdlg/colex \
+ sw/source/core/uibase/frmdlg/colmgr \
+ sw/source/core/uibase/frmdlg/frmmgr \
+ sw/source/core/uibase/globdoc/globdoc \
+ sw/source/core/uibase/index/idxmrk \
+ sw/source/core/uibase/dialog/wordcountwrapper \
+ sw/source/core/uibase/index/toxmgr \
+ sw/source/core/uibase/lingu/hhcwrp \
+ sw/source/core/uibase/lingu/hyp \
+ sw/source/core/uibase/lingu/olmenu \
+ sw/source/core/uibase/lingu/sdrhhcwrap \
+ sw/source/core/uibase/misc/glosdoc \
+ sw/source/core/uibase/misc/glshell \
+ sw/source/core/uibase/misc/numberingtypelistbox \
+ sw/source/core/uibase/misc/redlndlg \
+ sw/source/core/uibase/misc/swruler \
+ sw/source/core/uibase/ribbar/conarc \
+ sw/source/core/uibase/ribbar/concustomshape \
+ sw/source/core/uibase/ribbar/conform \
+ sw/source/core/uibase/ribbar/conpoly \
+ sw/source/core/uibase/ribbar/conrect \
+ sw/source/core/uibase/ribbar/drawbase \
+ sw/source/core/uibase/ribbar/dselect \
+ sw/source/core/uibase/ribbar/inputwin \
+ sw/source/core/uibase/ribbar/tblctrl \
+ sw/source/core/uibase/ribbar/tbxanchr \
+ sw/source/core/uibase/ribbar/workctrl \
+ sw/source/core/uibase/shells/annotsh \
+ sw/source/core/uibase/shells/basesh \
+ sw/source/core/uibase/shells/beziersh \
+ sw/source/core/uibase/shells/drawdlg \
+ sw/source/core/uibase/shells/drawsh \
+ sw/source/core/uibase/shells/drformsh \
+ sw/source/core/uibase/shells/drwbassh \
+ sw/source/core/uibase/shells/drwtxtex \
+ sw/source/core/uibase/shells/drwtxtsh \
+ sw/source/core/uibase/shells/frmsh \
+ sw/source/core/uibase/shells/grfsh \
+ sw/source/core/uibase/shells/grfshex \
+ sw/source/core/uibase/shells/langhelper \
+ sw/source/core/uibase/shells/listsh \
+ sw/source/core/uibase/shells/mediash \
+ sw/source/core/uibase/shells/navsh \
+ sw/source/core/uibase/shells/olesh \
+ sw/source/core/uibase/shells/slotadd \
+ sw/source/core/uibase/shells/tabsh \
+ sw/source/core/uibase/shells/textdrw \
+ sw/source/core/uibase/shells/textfld \
+ sw/source/core/uibase/shells/textglos \
+ sw/source/core/uibase/shells/textidx \
+ sw/source/core/uibase/shells/textsh \
+ sw/source/core/uibase/shells/textsh1 \
+ sw/source/core/uibase/shells/textsh2 \
+ sw/source/core/uibase/shells/txtattr \
+ sw/source/core/uibase/shells/txtcrsr \
+ sw/source/core/uibase/shells/txtnum \
+ sw/source/core/uibase/sidebar/PageOrientationControl \
+ sw/source/core/uibase/sidebar/PageMarginControl \
+ sw/source/core/uibase/sidebar/PageSizeControl \
+ sw/source/core/uibase/sidebar/PageColumnControl \
+ sw/source/core/uibase/sidebar/PagePropertyPanel \
+ sw/source/core/uibase/sidebar/WrapPropertyPanel \
+ sw/source/core/uibase/sidebar/SwPanelFactory \
+ sw/source/core/uibase/smartmenu/stmenu \
+ sw/source/core/uibase/table/chartins \
+ sw/source/core/uibase/table/swtablerep \
+ sw/source/core/uibase/table/tablemgr \
+ sw/source/core/uibase/uiview/formatclipboard \
+ sw/source/core/uibase/uiview/pview \
+ sw/source/core/uibase/uiview/scroll \
+ sw/source/core/uibase/uiview/srcview \
+ sw/source/core/uibase/uiview/swcli \
+ sw/source/core/uibase/uiview/uivwimp \
+ sw/source/core/uibase/uiview/view \
+ sw/source/core/uibase/uiview/view0 \
+ sw/source/core/uibase/uiview/view1 \
+ sw/source/core/uibase/uiview/view2 \
+ sw/source/core/uibase/uiview/viewcoll \
+ sw/source/core/uibase/uiview/viewdlg \
+ sw/source/core/uibase/uiview/viewdlg2 \
+ sw/source/core/uibase/uiview/viewdraw \
+ sw/source/core/uibase/uiview/viewling \
+ sw/source/core/uibase/uiview/viewmdi \
+ sw/source/core/uibase/uiview/viewport \
+ sw/source/core/uibase/uiview/viewprt \
+ sw/source/core/uibase/uiview/viewsrch \
+ sw/source/core/uibase/uiview/viewstat \
+ sw/source/core/uibase/uiview/viewtab \
+ sw/source/core/uibase/uno/SwXDocumentSettings \
+ sw/source/core/uibase/uno/SwXFilterOptions \
+ sw/source/core/uibase/uno/dlelstnr \
+ sw/source/core/uibase/uno/unoatxt \
+ sw/source/core/uibase/uno/unodefaults \
+ sw/source/core/uibase/uno/unodispatch \
+ sw/source/core/uibase/uno/unodoc \
+ sw/source/core/uibase/uno/unofreg \
+ sw/source/core/uibase/uno/unomailmerge \
+ sw/source/core/uibase/uno/unomod \
+ sw/source/core/uibase/uno/unomodule \
+ sw/source/core/uibase/uno/unotxdoc \
+ sw/source/core/uibase/uno/unotxvw \
+ sw/source/core/uibase/utlui/attrdesc \
+ sw/source/core/uibase/utlui/bookctrl \
+ sw/source/core/uibase/utlui/condedit \
+ sw/source/core/uibase/utlui/content \
+ sw/source/core/uibase/utlui/glbltree \
+ sw/source/core/uibase/utlui/gloslst \
+ sw/source/core/uibase/utlui/initui \
+ sw/source/core/uibase/utlui/navicfg \
+ sw/source/core/uibase/utlui/navipi \
+ sw/source/core/uibase/utlui/numfmtlb \
+ sw/source/core/uibase/utlui/prcntfld \
+ sw/source/core/uibase/utlui/shdwcrsr \
+ sw/source/core/uibase/utlui/tmplctrl \
+ sw/source/core/uibase/utlui/uiitems \
+ sw/source/core/uibase/utlui/uitool \
+ sw/source/core/uibase/utlui/unotools \
+ sw/source/core/uibase/utlui/viewlayoutctrl \
+ sw/source/core/uibase/utlui/wordcountctrl \
+ sw/source/core/uibase/utlui/zoomctrl \
+ sw/source/core/uibase/web/wdocsh \
+ sw/source/core/uibase/web/wformsh \
+ sw/source/core/uibase/web/wfrmsh \
+ sw/source/core/uibase/web/wgrfsh \
+ sw/source/core/uibase/web/wlistsh \
+ sw/source/core/uibase/web/wolesh \
+ sw/source/core/uibase/web/wtabsh \
+ sw/source/core/uibase/web/wtextsh \
+ sw/source/core/uibase/web/wview \
+ sw/source/core/uibase/wrtsh/delete \
+ sw/source/core/uibase/wrtsh/move \
+ sw/source/core/uibase/wrtsh/navmgr \
+ sw/source/core/uibase/wrtsh/select \
+ sw/source/core/uibase/wrtsh/wrtsh1 \
+ sw/source/core/uibase/wrtsh/wrtsh2 \
+ sw/source/core/uibase/wrtsh/wrtsh3 \
+ sw/source/core/uibase/wrtsh/wrtsh4 \
+ sw/source/core/uibase/wrtsh/wrtundo \
))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Library_add_exception_objects,sw,\
- sw/source/ui/dbui/dbmgr \
- sw/source/ui/dbui/dbtree \
- sw/source/ui/dbui/dbui \
- sw/source/ui/dbui/maildispatcher \
- sw/source/ui/dbui/mailmergechildwindow \
- sw/source/ui/dbui/mailmergehelper \
- sw/source/ui/dbui/mmconfigitem \
- sw/source/ui/dbui/swdbtoolsclient \
+ sw/source/core/uibase/dbui/dbmgr \
+ sw/source/core/uibase/dbui/dbtree \
+ sw/source/core/uibase/dbui/dbui \
+ sw/source/core/uibase/dbui/maildispatcher \
+ sw/source/core/uibase/dbui/mailmergechildwindow \
+ sw/source/core/uibase/dbui/mailmergehelper \
+ sw/source/core/uibase/dbui/mmconfigitem \
+ sw/source/core/uibase/dbui/swdbtoolsclient \
))
endif
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index b6932f1..7d466a5 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Library_Library,swui))
$(eval $(call gb_Library_set_include,swui,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/core/uibase/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(WORKDIR)/SdiTarget/sw/sdi \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 0a25f7b..f499f38 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Library_set_precompiled_header,vbaswobj,$(SRCDIR)/sw/inc/pch/pr
$(eval $(call gb_Library_set_include,vbaswobj,\
-I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/core/uibase/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/inc \
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index b5f2c94..762482e 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -28,8 +28,8 @@
#include "ndole.hxx"
#include <doc.hxx>
#include <docsh.hxx>
-#include <../../ui/inc/wrtsh.hxx>
-#include <../../ui/inc/view.hxx>
+#include <../uibase/inc/wrtsh.hxx>
+#include <../uibase/inc/view.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 04c3b3f..82e9ff3 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -96,7 +96,7 @@
#include <expfld.hxx>
#include <flddat.hxx>
#include <fldui.hrc>
-#include "../../ui/inc/fldmgr.hxx"
+#include "../uibase/inc/fldmgr.hxx"
#include "fldbas.hxx" // SwField
using namespace ::com::sun::star;
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/core/uibase/app/appenv.cxx
similarity index 100%
rename from sw/source/ui/app/appenv.cxx
rename to sw/source/core/uibase/app/appenv.cxx
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/core/uibase/app/apphdl.cxx
similarity index 100%
rename from sw/source/ui/app/apphdl.cxx
rename to sw/source/core/uibase/app/apphdl.cxx
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/core/uibase/app/applab.cxx
similarity index 100%
rename from sw/source/ui/app/applab.cxx
rename to sw/source/core/uibase/app/applab.cxx
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/core/uibase/app/appopt.cxx
similarity index 100%
rename from sw/source/ui/app/appopt.cxx
rename to sw/source/core/uibase/app/appopt.cxx
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/core/uibase/app/docsh.cxx
similarity index 100%
rename from sw/source/ui/app/docsh.cxx
rename to sw/source/core/uibase/app/docsh.cxx
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
similarity index 100%
rename from sw/source/ui/app/docsh2.cxx
rename to sw/source/core/uibase/app/docsh2.cxx
diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/core/uibase/app/docshdrw.cxx
similarity index 100%
rename from sw/source/ui/app/docshdrw.cxx
rename to sw/source/core/uibase/app/docshdrw.cxx
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/core/uibase/app/docshini.cxx
similarity index 100%
rename from sw/source/ui/app/docshini.cxx
rename to sw/source/core/uibase/app/docshini.cxx
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/core/uibase/app/docst.cxx
similarity index 100%
rename from sw/source/ui/app/docst.cxx
rename to sw/source/core/uibase/app/docst.cxx
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/core/uibase/app/docstyle.cxx
similarity index 100%
rename from sw/source/ui/app/docstyle.cxx
rename to sw/source/core/uibase/app/docstyle.cxx
diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/core/uibase/app/mainwn.cxx
similarity index 100%
rename from sw/source/ui/app/mainwn.cxx
rename to sw/source/core/uibase/app/mainwn.cxx
diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/core/uibase/app/swdll.cxx
similarity index 100%
rename from sw/source/ui/app/swdll.cxx
rename to sw/source/core/uibase/app/swdll.cxx
diff --git a/sw/source/ui/app/swdllimpl.hxx b/sw/source/core/uibase/app/swdllimpl.hxx
similarity index 100%
rename from sw/source/ui/app/swdllimpl.hxx
rename to sw/source/core/uibase/app/swdllimpl.hxx
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/core/uibase/app/swmodul1.cxx
similarity index 100%
rename from sw/source/ui/app/swmodul1.cxx
rename to sw/source/core/uibase/app/swmodul1.cxx
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/core/uibase/app/swmodule.cxx
similarity index 100%
rename from sw/source/ui/app/swmodule.cxx
rename to sw/source/core/uibase/app/swmodule.cxx
diff --git a/sw/source/ui/app/swwait.cxx b/sw/source/core/uibase/app/swwait.cxx
similarity index 100%
rename from sw/source/ui/app/swwait.cxx
rename to sw/source/core/uibase/app/swwait.cxx
diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/core/uibase/cctrl/actctrl.cxx
similarity index 100%
rename from sw/source/ui/cctrl/actctrl.cxx
rename to sw/source/core/uibase/cctrl/actctrl.cxx
diff --git a/sw/source/ui/cctrl/popbox.cxx b/sw/source/core/uibase/cctrl/popbox.cxx
similarity index 100%
rename from sw/source/ui/cctrl/popbox.cxx
rename to sw/source/core/uibase/cctrl/popbox.cxx
diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/core/uibase/cctrl/swlbox.cxx
similarity index 100%
rename from sw/source/ui/cctrl/swlbox.cxx
rename to sw/source/core/uibase/cctrl/swlbox.cxx
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/core/uibase/chrdlg/ccoll.cxx
similarity index 100%
rename from sw/source/ui/chrdlg/ccoll.cxx
rename to sw/source/core/uibase/chrdlg/ccoll.cxx
diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/core/uibase/config/barcfg.cxx
similarity index 100%
rename from sw/source/ui/config/barcfg.cxx
rename to sw/source/core/uibase/config/barcfg.cxx
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/core/uibase/config/caption.cxx
similarity index 100%
rename from sw/source/ui/config/caption.cxx
rename to sw/source/core/uibase/config/caption.cxx
diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/core/uibase/config/cfgitems.cxx
similarity index 100%
rename from sw/source/ui/config/cfgitems.cxx
rename to sw/source/core/uibase/config/cfgitems.cxx
diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/core/uibase/config/dbconfig.cxx
similarity index 100%
rename from sw/source/ui/config/dbconfig.cxx
rename to sw/source/core/uibase/config/dbconfig.cxx
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/core/uibase/config/fontcfg.cxx
similarity index 100%
rename from sw/source/ui/config/fontcfg.cxx
rename to sw/source/core/uibase/config/fontcfg.cxx
diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/core/uibase/config/modcfg.cxx
similarity index 100%
rename from sw/source/ui/config/modcfg.cxx
rename to sw/source/core/uibase/config/modcfg.cxx
diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/core/uibase/config/prtopt.cxx
similarity index 100%
rename from sw/source/ui/config/prtopt.cxx
rename to sw/source/core/uibase/config/prtopt.cxx
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/core/uibase/config/uinums.cxx
similarity index 100%
rename from sw/source/ui/config/uinums.cxx
rename to sw/source/core/uibase/config/uinums.cxx
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/core/uibase/config/usrpref.cxx
similarity index 100%
rename from sw/source/ui/config/usrpref.cxx
rename to sw/source/core/uibase/config/usrpref.cxx
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/core/uibase/config/viewopt.cxx
similarity index 100%
rename from sw/source/ui/config/viewopt.cxx
rename to sw/source/core/uibase/config/viewopt.cxx
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx
similarity index 100%
rename from sw/source/ui/dbui/dbmgr.cxx
rename to sw/source/core/uibase/dbui/dbmgr.cxx
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx
similarity index 100%
rename from sw/source/ui/dbui/dbtree.cxx
rename to sw/source/core/uibase/dbui/dbtree.cxx
diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/core/uibase/dbui/dbui.cxx
similarity index 100%
rename from sw/source/ui/dbui/dbui.cxx
rename to sw/source/core/uibase/dbui/dbui.cxx
diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/core/uibase/dbui/maildispatcher.cxx
similarity index 100%
rename from sw/source/ui/dbui/maildispatcher.cxx
rename to sw/source/core/uibase/dbui/maildispatcher.cxx
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
similarity index 99%
rename from sw/source/ui/dbui/mailmergechildwindow.cxx
rename to sw/source/core/uibase/dbui/mailmergechildwindow.cxx
index 48761c6..67966f1 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
@@ -27,7 +27,7 @@
#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
#include <mailmergechildwindow.hxx>
-#include <mmoutputpage.hxx>
+#include <../../../ui/dbui/mmoutputpage.hxx>
#include <mmconfigitem.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
diff --git a/sw/source/ui/dbui/mailmergechildwindow.hrc b/sw/source/core/uibase/dbui/mailmergechildwindow.hrc
similarity index 100%
rename from sw/source/ui/dbui/mailmergechildwindow.hrc
rename to sw/source/core/uibase/dbui/mailmergechildwindow.hrc
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/core/uibase/dbui/mailmergechildwindow.src
similarity index 100%
rename from sw/source/ui/dbui/mailmergechildwindow.src
rename to sw/source/core/uibase/dbui/mailmergechildwindow.src
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/core/uibase/dbui/mailmergehelper.cxx
similarity index 100%
rename from sw/source/ui/dbui/mailmergehelper.cxx
rename to sw/source/core/uibase/dbui/mailmergehelper.cxx
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/core/uibase/dbui/mmconfigitem.cxx
similarity index 100%
rename from sw/source/ui/dbui/mmconfigitem.cxx
rename to sw/source/core/uibase/dbui/mmconfigitem.cxx
diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/core/uibase/dbui/swdbtoolsclient.cxx
similarity index 100%
rename from sw/source/ui/dbui/swdbtoolsclient.cxx
rename to sw/source/core/uibase/dbui/swdbtoolsclient.cxx
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
similarity index 100%
rename from sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
rename to sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/core/uibase/dialog/regionsw.cxx
similarity index 100%
rename from sw/source/ui/dialog/regionsw.cxx
rename to sw/source/core/uibase/dialog/regionsw.cxx
diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/core/uibase/dialog/regionsw.hrc
similarity index 100%
rename from sw/source/ui/dialog/regionsw.hrc
rename to sw/source/core/uibase/dialog/regionsw.hrc
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/core/uibase/dialog/regionsw.src
similarity index 100%
rename from sw/source/ui/dialog/regionsw.src
rename to sw/source/core/uibase/dialog/regionsw.src
diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/core/uibase/dialog/swabstdlg.cxx
similarity index 100%
rename from sw/source/ui/dialog/swabstdlg.cxx
rename to sw/source/core/uibase/dialog/swabstdlg.cxx
diff --git a/sw/source/ui/dialog/swwrtshitem.cxx b/sw/source/core/uibase/dialog/swwrtshitem.cxx
similarity index 100%
rename from sw/source/ui/dialog/swwrtshitem.cxx
rename to sw/source/core/uibase/dialog/swwrtshitem.cxx
diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx b/sw/source/core/uibase/dialog/wordcountwrapper.cxx
similarity index 100%
rename from sw/source/ui/dialog/wordcountwrapper.cxx
rename to sw/source/core/uibase/dialog/wordcountwrapper.cxx
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/core/uibase/dochdl/gloshdl.cxx
similarity index 100%
rename from sw/source/ui/dochdl/gloshdl.cxx
rename to sw/source/core/uibase/dochdl/gloshdl.cxx
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/core/uibase/dochdl/swdtflvr.cxx
similarity index 100%
rename from sw/source/ui/dochdl/swdtflvr.cxx
rename to sw/source/core/uibase/dochdl/swdtflvr.cxx
diff --git a/sw/source/ui/docvw/AnchorOverlayObject.cxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx
similarity index 100%
rename from sw/source/ui/docvw/AnchorOverlayObject.cxx
rename to sw/source/core/uibase/docvw/AnchorOverlayObject.cxx
diff --git a/sw/source/ui/docvw/AnchorOverlayObject.hxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
similarity index 100%
rename from sw/source/ui/docvw/AnchorOverlayObject.hxx
rename to sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
diff --git a/sw/source/ui/docvw/AnnotationMenuButton.cxx b/sw/source/core/uibase/docvw/AnnotationMenuButton.cxx
similarity index 100%
rename from sw/source/ui/docvw/AnnotationMenuButton.cxx
rename to sw/source/core/uibase/docvw/AnnotationMenuButton.cxx
diff --git a/sw/source/ui/docvw/AnnotationMenuButton.hxx b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
similarity index 100%
rename from sw/source/ui/docvw/AnnotationMenuButton.hxx
rename to sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/core/uibase/docvw/AnnotationWin.cxx
similarity index 100%
rename from sw/source/ui/docvw/AnnotationWin.cxx
rename to sw/source/core/uibase/docvw/AnnotationWin.cxx
diff --git a/sw/source/ui/docvw/DashedLine.cxx b/sw/source/core/uibase/docvw/DashedLine.cxx
similarity index 100%
rename from sw/source/ui/docvw/DashedLine.cxx
rename to sw/source/core/uibase/docvw/DashedLine.cxx
diff --git a/sw/source/ui/docvw/FrameControlsManager.cxx b/sw/source/core/uibase/docvw/FrameControlsManager.cxx
similarity index 100%
rename from sw/source/ui/docvw/FrameControlsManager.cxx
rename to sw/source/core/uibase/docvw/FrameControlsManager.cxx
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/core/uibase/docvw/HeaderFooterWin.cxx
similarity index 100%
rename from sw/source/ui/docvw/HeaderFooterWin.cxx
rename to sw/source/core/uibase/docvw/HeaderFooterWin.cxx
diff --git a/sw/source/ui/docvw/OverlayRanges.cxx b/sw/source/core/uibase/docvw/OverlayRanges.cxx
similarity index 100%
rename from sw/source/ui/docvw/OverlayRanges.cxx
rename to sw/source/core/uibase/docvw/OverlayRanges.cxx
diff --git a/sw/source/ui/docvw/OverlayRanges.hxx b/sw/source/core/uibase/docvw/OverlayRanges.hxx
similarity index 100%
rename from sw/source/ui/docvw/OverlayRanges.hxx
rename to sw/source/core/uibase/docvw/OverlayRanges.hxx
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/core/uibase/docvw/PageBreakWin.cxx
similarity index 100%
rename from sw/source/ui/docvw/PageBreakWin.cxx
rename to sw/source/core/uibase/docvw/PageBreakWin.cxx
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/core/uibase/docvw/PostItMgr.cxx
similarity index 100%
rename from sw/source/ui/docvw/PostItMgr.cxx
rename to sw/source/core/uibase/docvw/PostItMgr.cxx
diff --git a/sw/source/ui/docvw/ShadowOverlayObject.cxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx
similarity index 100%
rename from sw/source/ui/docvw/ShadowOverlayObject.cxx
rename to sw/source/core/uibase/docvw/ShadowOverlayObject.cxx
diff --git a/sw/source/ui/docvw/ShadowOverlayObject.hxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
similarity index 100%
rename from sw/source/ui/docvw/ShadowOverlayObject.hxx
rename to sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/core/uibase/docvw/SidebarTxtControl.cxx
similarity index 100%
rename from sw/source/ui/docvw/SidebarTxtControl.cxx
rename to sw/source/core/uibase/docvw/SidebarTxtControl.cxx
diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx
similarity index 100%
rename from sw/source/ui/docvw/SidebarTxtControl.hxx
rename to sw/source/core/uibase/docvw/SidebarTxtControl.hxx
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
similarity index 100%
rename from sw/source/ui/docvw/SidebarTxtControlAcc.cxx
rename to sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.hxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
similarity index 100%
rename from sw/source/ui/docvw/SidebarTxtControlAcc.hxx
rename to sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/core/uibase/docvw/SidebarWin.cxx
similarity index 100%
rename from sw/source/ui/docvw/SidebarWin.cxx
rename to sw/source/core/uibase/docvw/SidebarWin.cxx
diff --git a/sw/source/ui/docvw/SidebarWinAcc.cxx b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx
similarity index 100%
rename from sw/source/ui/docvw/SidebarWinAcc.cxx
rename to sw/source/core/uibase/docvw/SidebarWinAcc.cxx
diff --git a/sw/source/ui/docvw/SidebarWinAcc.hxx b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx
similarity index 100%
rename from sw/source/ui/docvw/SidebarWinAcc.hxx
rename to sw/source/core/uibase/docvw/SidebarWinAcc.hxx
diff --git a/sw/source/ui/docvw/annotation.hrc b/sw/source/core/uibase/docvw/annotation.hrc
similarity index 100%
rename from sw/source/ui/docvw/annotation.hrc
rename to sw/source/core/uibase/docvw/annotation.hrc
diff --git a/sw/source/ui/docvw/docvw.hrc b/sw/source/core/uibase/docvw/docvw.hrc
similarity index 100%
rename from sw/source/ui/docvw/docvw.hrc
rename to sw/source/core/uibase/docvw/docvw.hrc
diff --git a/sw/source/ui/docvw/docvw.src b/sw/source/core/uibase/docvw/docvw.src
similarity index 100%
rename from sw/source/ui/docvw/docvw.src
rename to sw/source/core/uibase/docvw/docvw.src
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/core/uibase/docvw/edtdd.cxx
similarity index 100%
rename from sw/source/ui/docvw/edtdd.cxx
rename to sw/source/core/uibase/docvw/edtdd.cxx
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx
similarity index 100%
rename from sw/source/ui/docvw/edtwin.cxx
rename to sw/source/core/uibase/docvw/edtwin.cxx
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/core/uibase/docvw/edtwin2.cxx
similarity index 100%
rename from sw/source/ui/docvw/edtwin2.cxx
rename to sw/source/core/uibase/docvw/edtwin2.cxx
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/core/uibase/docvw/edtwin3.cxx
similarity index 100%
rename from sw/source/ui/docvw/edtwin3.cxx
rename to sw/source/core/uibase/docvw/edtwin3.cxx
diff --git a/sw/source/ui/docvw/frmsidebarwincontainer.cxx b/sw/source/core/uibase/docvw/frmsidebarwincontainer.cxx
similarity index 100%
rename from sw/source/ui/docvw/frmsidebarwincontainer.cxx
rename to sw/source/core/uibase/docvw/frmsidebarwincontainer.cxx
diff --git a/sw/source/ui/docvw/frmsidebarwincontainer.hxx b/sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx
similarity index 100%
rename from sw/source/ui/docvw/frmsidebarwincontainer.hxx
rename to sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/core/uibase/docvw/romenu.cxx
similarity index 100%
rename from sw/source/ui/docvw/romenu.cxx
rename to sw/source/core/uibase/docvw/romenu.cxx
diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/core/uibase/docvw/romenu.hxx
similarity index 100%
rename from sw/source/ui/docvw/romenu.hxx
rename to sw/source/core/uibase/docvw/romenu.hxx
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/core/uibase/docvw/srcedtw.cxx
similarity index 100%
rename from sw/source/ui/docvw/srcedtw.cxx
rename to sw/source/core/uibase/docvw/srcedtw.cxx
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/core/uibase/envelp/envimg.cxx
similarity index 100%
rename from sw/source/ui/envelp/envimg.cxx
rename to sw/source/core/uibase/envelp/envimg.cxx
diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/core/uibase/envelp/label.hrc
similarity index 100%
rename from sw/source/ui/envelp/label.hrc
rename to sw/source/core/uibase/envelp/label.hrc
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/core/uibase/envelp/labelcfg.cxx
similarity index 100%
rename from sw/source/ui/envelp/labelcfg.cxx
rename to sw/source/core/uibase/envelp/labelcfg.cxx
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/core/uibase/envelp/labimg.cxx
similarity index 100%
rename from sw/source/ui/envelp/labimg.cxx
rename to sw/source/core/uibase/envelp/labimg.cxx
diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/core/uibase/envelp/labimp.hxx
similarity index 100%
rename from sw/source/ui/envelp/labimp.hxx
rename to sw/source/core/uibase/envelp/labimp.hxx
diff --git a/sw/source/ui/envelp/syncbtn.cxx b/sw/source/core/uibase/envelp/syncbtn.cxx
similarity index 100%
rename from sw/source/ui/envelp/syncbtn.cxx
rename to sw/source/core/uibase/envelp/syncbtn.cxx
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/core/uibase/fldui/fldmgr.cxx
similarity index 100%
rename from sw/source/ui/fldui/fldmgr.cxx
rename to sw/source/core/uibase/fldui/fldmgr.cxx
diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/core/uibase/fldui/fldwrap.cxx
similarity index 100%
rename from sw/source/ui/fldui/fldwrap.cxx
rename to sw/source/core/uibase/fldui/fldwrap.cxx
diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/core/uibase/fldui/xfldui.cxx
similarity index 100%
rename from sw/source/ui/fldui/xfldui.cxx
rename to sw/source/core/uibase/fldui/xfldui.cxx
diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/core/uibase/frmdlg/colex.cxx
similarity index 100%
rename from sw/source/ui/frmdlg/colex.cxx
rename to sw/source/core/uibase/frmdlg/colex.cxx
diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/core/uibase/frmdlg/colmgr.cxx
similarity index 100%
rename from sw/source/ui/frmdlg/colmgr.cxx
rename to sw/source/core/uibase/frmdlg/colmgr.cxx
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/core/uibase/frmdlg/frmmgr.cxx
similarity index 100%
rename from sw/source/ui/frmdlg/frmmgr.cxx
rename to sw/source/core/uibase/frmdlg/frmmgr.cxx
diff --git a/sw/source/ui/globdoc/globdoc.cxx b/sw/source/core/uibase/globdoc/globdoc.cxx
similarity index 100%
rename from sw/source/ui/globdoc/globdoc.cxx
rename to sw/source/core/uibase/globdoc/globdoc.cxx
diff --git a/sw/source/ui/inc/DashedLine.hxx b/sw/source/core/uibase/inc/DashedLine.hxx
similarity index 100%
rename from sw/source/ui/inc/DashedLine.hxx
rename to sw/source/core/uibase/inc/DashedLine.hxx
diff --git a/sw/source/ui/inc/DropDownFieldDialog.hxx b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
similarity index 100%
rename from sw/source/ui/inc/DropDownFieldDialog.hxx
rename to sw/source/core/uibase/inc/DropDownFieldDialog.hxx
diff --git a/sw/source/ui/inc/FrameControl.hxx b/sw/source/core/uibase/inc/FrameControl.hxx
similarity index 100%
rename from sw/source/ui/inc/FrameControl.hxx
rename to sw/source/core/uibase/inc/FrameControl.hxx
diff --git a/sw/source/ui/inc/FrameControlsManager.hxx b/sw/source/core/uibase/inc/FrameControlsManager.hxx
similarity index 100%
rename from sw/source/ui/inc/FrameControlsManager.hxx
rename to sw/source/core/uibase/inc/FrameControlsManager.hxx
diff --git a/sw/source/ui/inc/HeaderFooterWin.hxx b/sw/source/core/uibase/inc/HeaderFooterWin.hxx
similarity index 100%
rename from sw/source/ui/inc/HeaderFooterWin.hxx
rename to sw/source/core/uibase/inc/HeaderFooterWin.hxx
diff --git a/sw/source/ui/inc/PageBreakWin.hxx b/sw/source/core/uibase/inc/PageBreakWin.hxx
similarity index 100%
rename from sw/source/ui/inc/PageBreakWin.hxx
rename to sw/source/core/uibase/inc/PageBreakWin.hxx
diff --git a/sw/source/ui/inc/SidebarWindowsConsts.hxx b/sw/source/core/uibase/inc/SidebarWindowsConsts.hxx
similarity index 100%
rename from sw/source/ui/inc/SidebarWindowsConsts.hxx
rename to sw/source/core/uibase/inc/SidebarWindowsConsts.hxx
diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx
similarity index 100%
rename from sw/source/ui/inc/SwSpellDialogChildWindow.hxx
rename to sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx
diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/core/uibase/inc/SwXFilterOptions.hxx
similarity index 100%
rename from sw/source/ui/inc/SwXFilterOptions.hxx
rename to sw/source/core/uibase/inc/SwXFilterOptions.hxx
diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/core/uibase/inc/abstract.hxx
similarity index 100%
rename from sw/source/ui/inc/abstract.hxx
rename to sw/source/core/uibase/inc/abstract.hxx
diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/core/uibase/inc/actctrl.hxx
similarity index 100%
rename from sw/source/ui/inc/actctrl.hxx
rename to sw/source/core/uibase/inc/actctrl.hxx
diff --git a/sw/source/ui/inc/addrdlg.hxx b/sw/source/core/uibase/inc/addrdlg.hxx
similarity index 100%
rename from sw/source/ui/inc/addrdlg.hxx
rename to sw/source/core/uibase/inc/addrdlg.hxx
diff --git a/sw/source/ui/inc/annotsh.hxx b/sw/source/core/uibase/inc/annotsh.hxx
similarity index 100%
rename from sw/source/ui/inc/annotsh.hxx
rename to sw/source/core/uibase/inc/annotsh.hxx
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/core/uibase/inc/app.hrc
similarity index 100%
rename from sw/source/ui/inc/app.hrc
rename to sw/source/core/uibase/inc/app.hrc
diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/core/uibase/inc/ascfldlg.hxx
similarity index 100%
rename from sw/source/ui/inc/ascfldlg.hxx
rename to sw/source/core/uibase/inc/ascfldlg.hxx
diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/core/uibase/inc/autoedit.hxx
similarity index 100%
rename from sw/source/ui/inc/autoedit.hxx
rename to sw/source/core/uibase/inc/autoedit.hxx
diff --git a/sw/source/ui/inc/barcfg.hxx b/sw/source/core/uibase/inc/barcfg.hxx
similarity index 100%
rename from sw/source/ui/inc/barcfg.hxx
rename to sw/source/core/uibase/inc/barcfg.hxx
diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/core/uibase/inc/basesh.hxx
similarity index 100%
rename from sw/source/ui/inc/basesh.hxx
rename to sw/source/core/uibase/inc/basesh.hxx
diff --git a/sw/source/ui/inc/beziersh.hxx b/sw/source/core/uibase/inc/beziersh.hxx
similarity index 100%
rename from sw/source/ui/inc/beziersh.hxx
rename to sw/source/core/uibase/inc/beziersh.hxx
diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/core/uibase/inc/bmpwin.hxx
similarity index 100%
rename from sw/source/ui/inc/bmpwin.hxx
rename to sw/source/core/uibase/inc/bmpwin.hxx
diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/core/uibase/inc/bookctrl.hxx
similarity index 100%
rename from sw/source/ui/inc/bookctrl.hxx
rename to sw/source/core/uibase/inc/bookctrl.hxx
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/core/uibase/inc/bookmark.hxx
similarity index 100%
rename from sw/source/ui/inc/bookmark.hxx
rename to sw/source/core/uibase/inc/bookmark.hxx
diff --git a/sw/source/ui/inc/break.hxx b/sw/source/core/uibase/inc/break.hxx
similarity index 100%
rename from sw/source/ui/inc/break.hxx
rename to sw/source/core/uibase/inc/break.hxx
diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/core/uibase/inc/caption.hxx
similarity index 100%
rename from sw/source/ui/inc/caption.hxx
rename to sw/source/core/uibase/inc/caption.hxx
diff --git a/sw/source/ui/inc/cfgid.h b/sw/source/core/uibase/inc/cfgid.h
similarity index 100%
rename from sw/source/ui/inc/cfgid.h
rename to sw/source/core/uibase/inc/cfgid.h
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/core/uibase/inc/cfgitems.hxx
similarity index 100%
rename from sw/source/ui/inc/cfgitems.hxx
rename to sw/source/core/uibase/inc/cfgitems.hxx
diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/core/uibase/inc/changedb.hxx
similarity index 100%
rename from sw/source/ui/inc/changedb.hxx
rename to sw/source/core/uibase/inc/changedb.hxx
diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/core/uibase/inc/chartins.hxx
similarity index 100%
rename from sw/source/ui/inc/chartins.hxx
rename to sw/source/core/uibase/inc/chartins.hxx
diff --git a/sw/source/ui/inc/chldwrap.hxx b/sw/source/core/uibase/inc/chldwrap.hxx
similarity index 100%
rename from sw/source/ui/inc/chldwrap.hxx
rename to sw/source/core/uibase/inc/chldwrap.hxx
diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/core/uibase/inc/chrdlg.hxx
similarity index 100%
rename from sw/source/ui/inc/chrdlg.hxx
rename to sw/source/core/uibase/inc/chrdlg.hxx
diff --git a/sw/source/ui/inc/chrdlgmodes.hxx b/sw/source/core/uibase/inc/chrdlgmodes.hxx
similarity index 100%
rename from sw/source/ui/inc/chrdlgmodes.hxx
rename to sw/source/core/uibase/inc/chrdlgmodes.hxx
diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/core/uibase/inc/cnttab.hxx
similarity index 100%
rename from sw/source/ui/inc/cnttab.hxx
rename to sw/source/core/uibase/inc/cnttab.hxx
diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/core/uibase/inc/colex.hxx
similarity index 100%
rename from sw/source/ui/inc/colex.hxx
rename to sw/source/core/uibase/inc/colex.hxx
diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/core/uibase/inc/colmgr.hxx
similarity index 100%
rename from sw/source/ui/inc/colmgr.hxx
rename to sw/source/core/uibase/inc/colmgr.hxx
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx
similarity index 100%
rename from sw/source/ui/inc/column.hxx
rename to sw/source/core/uibase/inc/column.hxx
diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/core/uibase/inc/conarc.hxx
similarity index 100%
rename from sw/source/ui/inc/conarc.hxx
rename to sw/source/core/uibase/inc/conarc.hxx
diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/core/uibase/inc/concustomshape.hxx
similarity index 100%
rename from sw/source/ui/inc/concustomshape.hxx
rename to sw/source/core/uibase/inc/concustomshape.hxx
diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/core/uibase/inc/condedit.hxx
similarity index 100%
rename from sw/source/ui/inc/condedit.hxx
rename to sw/source/core/uibase/inc/condedit.hxx
diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/core/uibase/inc/conform.hxx
similarity index 100%
rename from sw/source/ui/inc/conform.hxx
rename to sw/source/core/uibase/inc/conform.hxx
diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/core/uibase/inc/conpoly.hxx
similarity index 100%
rename from sw/source/ui/inc/conpoly.hxx
rename to sw/source/core/uibase/inc/conpoly.hxx
diff --git a/sw/source/ui/inc/conrect.hxx b/sw/source/core/uibase/inc/conrect.hxx
similarity index 100%
rename from sw/source/ui/inc/conrect.hxx
rename to sw/source/core/uibase/inc/conrect.hxx
diff --git a/sw/source/ui/inc/content.hxx b/sw/source/core/uibase/inc/content.hxx
similarity index 100%
rename from sw/source/ui/inc/content.hxx
rename to sw/source/core/uibase/inc/content.hxx
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx
similarity index 100%
rename from sw/source/ui/inc/conttree.hxx
rename to sw/source/core/uibase/inc/conttree.hxx
diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/core/uibase/inc/convert.hxx
similarity index 100%
rename from sw/source/ui/inc/convert.hxx
rename to sw/source/core/uibase/inc/convert.hxx
diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/core/uibase/inc/cption.hxx
similarity index 100%
rename from sw/source/ui/inc/cption.hxx
rename to sw/source/core/uibase/inc/cption.hxx
diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/core/uibase/inc/dbconfig.hxx
similarity index 100%
rename from sw/source/ui/inc/dbconfig.hxx
rename to sw/source/core/uibase/inc/dbconfig.hxx
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/core/uibase/inc/dbinsdlg.hxx
similarity index 100%
rename from sw/source/ui/inc/dbinsdlg.hxx
rename to sw/source/core/uibase/inc/dbinsdlg.hxx
diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/core/uibase/inc/dbtree.hxx
similarity index 100%
rename from sw/source/ui/inc/dbtree.hxx
rename to sw/source/core/uibase/inc/dbtree.hxx
diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/core/uibase/inc/dbui.hxx
similarity index 100%
rename from sw/source/ui/inc/dbui.hxx
rename to sw/source/core/uibase/inc/dbui.hxx
diff --git a/sw/source/ui/inc/dialmgr.hxx b/sw/source/core/uibase/inc/dialmgr.hxx
similarity index 100%
rename from sw/source/ui/inc/dialmgr.hxx
rename to sw/source/core/uibase/inc/dialmgr.hxx
diff --git a/sw/source/ui/inc/docfnote.hxx b/sw/source/core/uibase/inc/docfnote.hxx
similarity index 100%
rename from sw/source/ui/inc/docfnote.hxx
rename to sw/source/core/uibase/inc/docfnote.hxx
diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/core/uibase/inc/docstdlg.hxx
similarity index 100%
rename from sw/source/ui/inc/docstdlg.hxx
rename to sw/source/core/uibase/inc/docstdlg.hxx
diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/core/uibase/inc/drawbase.hxx
similarity index 100%
rename from sw/source/ui/inc/drawbase.hxx
rename to sw/source/core/uibase/inc/drawbase.hxx
diff --git a/sw/source/ui/inc/drawsh.hxx b/sw/source/core/uibase/inc/drawsh.hxx
similarity index 100%
rename from sw/source/ui/inc/drawsh.hxx
rename to sw/source/core/uibase/inc/drawsh.hxx
diff --git a/sw/source/ui/inc/drformsh.hxx b/sw/source/core/uibase/inc/drformsh.hxx
similarity index 100%
rename from sw/source/ui/inc/drformsh.hxx
rename to sw/source/core/uibase/inc/drformsh.hxx
diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx
similarity index 100%
rename from sw/source/ui/inc/drpcps.hxx
rename to sw/source/core/uibase/inc/drpcps.hxx
diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/core/uibase/inc/drwbassh.hxx
similarity index 100%
rename from sw/source/ui/inc/drwbassh.hxx
rename to sw/source/core/uibase/inc/drwbassh.hxx
diff --git a/sw/source/ui/inc/drwtxtsh.hxx b/sw/source/core/uibase/inc/drwtxtsh.hxx
similarity index 100%
rename from sw/source/ui/inc/drwtxtsh.hxx
rename to sw/source/core/uibase/inc/drwtxtsh.hxx
diff --git a/sw/source/ui/inc/dselect.hxx b/sw/source/core/uibase/inc/dselect.hxx
similarity index 100%
rename from sw/source/ui/inc/dselect.hxx
rename to sw/source/core/uibase/inc/dselect.hxx
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/core/uibase/inc/edtwin.hxx
similarity index 100%
rename from sw/source/ui/inc/edtwin.hxx
rename to sw/source/core/uibase/inc/edtwin.hxx
diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/core/uibase/inc/envimg.hxx
similarity index 100%
rename from sw/source/ui/inc/envimg.hxx
rename to sw/source/core/uibase/inc/envimg.hxx
diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/core/uibase/inc/envlop.hxx
similarity index 100%
rename from sw/source/ui/inc/envlop.hxx
rename to sw/source/core/uibase/inc/envlop.hxx
diff --git a/sw/source/ui/inc/fldedt.hxx b/sw/source/core/uibase/inc/fldedt.hxx
similarity index 100%
rename from sw/source/ui/inc/fldedt.hxx
rename to sw/source/core/uibase/inc/fldedt.hxx
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/core/uibase/inc/fldmgr.hxx
similarity index 100%
rename from sw/source/ui/inc/fldmgr.hxx
rename to sw/source/core/uibase/inc/fldmgr.hxx
diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/core/uibase/inc/fldtdlg.hxx
similarity index 100%
rename from sw/source/ui/inc/fldtdlg.hxx
rename to sw/source/core/uibase/inc/fldtdlg.hxx
diff --git a/sw/source/ui/inc/fldwrap.hxx b/sw/source/core/uibase/inc/fldwrap.hxx
similarity index 100%
rename from sw/source/ui/inc/fldwrap.hxx
rename to sw/source/core/uibase/inc/fldwrap.hxx
diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/core/uibase/inc/fontcfg.hxx
similarity index 100%
rename from sw/source/ui/inc/fontcfg.hxx
rename to sw/source/core/uibase/inc/fontcfg.hxx
diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/core/uibase/inc/formatclipboard.hxx
similarity index 100%
rename from sw/source/ui/inc/formatclipboard.hxx
rename to sw/source/core/uibase/inc/formatclipboard.hxx
diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/core/uibase/inc/formedt.hxx
similarity index 100%
rename from sw/source/ui/inc/formedt.hxx
rename to sw/source/core/uibase/inc/formedt.hxx
diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/core/uibase/inc/frmdlg.hxx
similarity index 100%
rename from sw/source/ui/inc/frmdlg.hxx
rename to sw/source/core/uibase/inc/frmdlg.hxx
diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/core/uibase/inc/frmmgr.hxx
similarity index 100%
rename from sw/source/ui/inc/frmmgr.hxx
rename to sw/source/core/uibase/inc/frmmgr.hxx
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/core/uibase/inc/frmpage.hxx
similarity index 100%
rename from sw/source/ui/inc/frmpage.hxx
rename to sw/source/core/uibase/inc/frmpage.hxx
diff --git a/sw/source/ui/inc/frmsh.hxx b/sw/source/core/uibase/inc/frmsh.hxx
similarity index 100%
rename from sw/source/ui/inc/frmsh.hxx
rename to sw/source/core/uibase/inc/frmsh.hxx
diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/core/uibase/inc/frmui.hrc
similarity index 100%
rename from sw/source/ui/inc/frmui.hrc
rename to sw/source/core/uibase/inc/frmui.hrc
diff --git a/sw/source/ui/inc/globals.h b/sw/source/core/uibase/inc/globals.h
similarity index 100%
rename from sw/source/ui/inc/globals.h
rename to sw/source/core/uibase/inc/globals.h
diff --git a/sw/source/ui/inc/globdoc.hrc b/sw/source/core/uibase/inc/globdoc.hrc
similarity index 100%
rename from sw/source/ui/inc/globdoc.hrc
rename to sw/source/core/uibase/inc/globdoc.hrc
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/core/uibase/inc/glosbib.hxx
similarity index 100%
rename from sw/source/ui/inc/glosbib.hxx
rename to sw/source/core/uibase/inc/glosbib.hxx
diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/core/uibase/inc/glosdoc.hxx
similarity index 100%
rename from sw/source/ui/inc/glosdoc.hxx
rename to sw/source/core/uibase/inc/glosdoc.hxx
diff --git a/sw/source/ui/inc/gloshdl.hxx b/sw/source/core/uibase/inc/gloshdl.hxx
similarity index 100%
rename from sw/source/ui/inc/gloshdl.hxx
rename to sw/source/core/uibase/inc/gloshdl.hxx
diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/core/uibase/inc/gloslst.hxx
similarity index 100%
rename from sw/source/ui/inc/gloslst.hxx
rename to sw/source/core/uibase/inc/gloslst.hxx
diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/core/uibase/inc/glossary.hxx
similarity index 100%
rename from sw/source/ui/inc/glossary.hxx
rename to sw/source/core/uibase/inc/glossary.hxx
diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/core/uibase/inc/glshell.hxx
similarity index 100%
rename from sw/source/ui/inc/glshell.hxx
rename to sw/source/core/uibase/inc/glshell.hxx
diff --git a/sw/source/ui/inc/grfsh.hxx b/sw/source/core/uibase/inc/grfsh.hxx
similarity index 100%
rename from sw/source/ui/inc/grfsh.hxx
rename to sw/source/core/uibase/inc/grfsh.hxx
diff --git a/sw/source/ui/inc/hyp.hxx b/sw/source/core/uibase/inc/hyp.hxx
similarity index 100%
rename from sw/source/ui/inc/hyp.hxx
rename to sw/source/core/uibase/inc/hyp.hxx
diff --git a/sw/source/ui/inc/idxmrk.hxx b/sw/source/core/uibase/inc/idxmrk.hxx
similarity index 100%
rename from sw/source/ui/inc/idxmrk.hxx
rename to sw/source/core/uibase/inc/idxmrk.hxx
diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/core/uibase/inc/imaildsplistener.hxx
similarity index 100%
rename from sw/source/ui/inc/imaildsplistener.hxx
rename to sw/source/core/uibase/inc/imaildsplistener.hxx
diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/core/uibase/inc/initui.hxx
similarity index 100%
rename from sw/source/ui/inc/initui.hxx
rename to sw/source/core/uibase/inc/initui.hxx
diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/core/uibase/inc/inpdlg.hxx
similarity index 100%
rename from sw/source/ui/inc/inpdlg.hxx
rename to sw/source/core/uibase/inc/inpdlg.hxx
diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/core/uibase/inc/inputwin.hxx
similarity index 100%
rename from sw/source/ui/inc/inputwin.hxx
rename to sw/source/core/uibase/inc/inputwin.hxx
diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/core/uibase/inc/insfnote.hxx
similarity index 100%
rename from sw/source/ui/inc/insfnote.hxx
rename to sw/source/core/uibase/inc/insfnote.hxx
diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/core/uibase/inc/instable.hxx
similarity index 100%
rename from sw/source/ui/inc/instable.hxx
rename to sw/source/core/uibase/inc/instable.hxx
diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/core/uibase/inc/javaedit.hxx
similarity index 100%
rename from sw/source/ui/inc/javaedit.hxx
rename to sw/source/core/uibase/inc/javaedit.hxx
diff --git a/sw/source/ui/inc/label.hxx b/sw/source/core/uibase/inc/label.hxx
similarity index 100%
rename from sw/source/ui/inc/label.hxx
rename to sw/source/core/uibase/inc/label.hxx
diff --git a/sw/source/ui/inc/labelcfg.hxx b/sw/source/core/uibase/inc/labelcfg.hxx
similarity index 100%
rename from sw/source/ui/inc/labelcfg.hxx
rename to sw/source/core/uibase/inc/labelcfg.hxx
diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/core/uibase/inc/labimg.hxx
similarity index 100%
rename from sw/source/ui/inc/labimg.hxx
rename to sw/source/core/uibase/inc/labimg.hxx
diff --git a/sw/source/ui/inc/langhelper.hxx b/sw/source/core/uibase/inc/langhelper.hxx
similarity index 100%
rename from sw/source/ui/inc/langhelper.hxx
rename to sw/source/core/uibase/inc/langhelper.hxx
diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/core/uibase/inc/linenum.hxx
similarity index 100%
rename from sw/source/ui/inc/linenum.hxx
rename to sw/source/core/uibase/inc/linenum.hxx
diff --git a/sw/source/ui/inc/listsh.hxx b/sw/source/core/uibase/inc/listsh.hxx
similarity index 100%
rename from sw/source/ui/inc/listsh.hxx
rename to sw/source/core/uibase/inc/listsh.hxx
diff --git a/sw/source/ui/inc/macassgn.hxx b/sw/source/core/uibase/inc/macassgn.hxx
similarity index 100%
rename from sw/source/ui/inc/macassgn.hxx
rename to sw/source/core/uibase/inc/macassgn.hxx
diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/core/uibase/inc/mailconfigpage.hxx
similarity index 100%
rename from sw/source/ui/inc/mailconfigpage.hxx
rename to sw/source/core/uibase/inc/mailconfigpage.hxx
diff --git a/sw/source/ui/inc/maildispatcher.hxx b/sw/source/core/uibase/inc/maildispatcher.hxx
similarity index 100%
rename from sw/source/ui/inc/maildispatcher.hxx
rename to sw/source/core/uibase/inc/maildispatcher.hxx
diff --git a/sw/source/ui/inc/mailmergechildwindow.hxx b/sw/source/core/uibase/inc/mailmergechildwindow.hxx
similarity index 100%
rename from sw/source/ui/inc/mailmergechildwindow.hxx
rename to sw/source/core/uibase/inc/mailmergechildwindow.hxx
diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/core/uibase/inc/mailmergehelper.hxx
similarity index 100%
rename from sw/source/ui/inc/mailmergehelper.hxx
rename to sw/source/core/uibase/inc/mailmergehelper.hxx
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/core/uibase/inc/mailmergewizard.hxx
similarity index 100%
rename from sw/source/ui/inc/mailmergewizard.hxx
rename to sw/source/core/uibase/inc/mailmergewizard.hxx
diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/core/uibase/inc/mailmrge.hxx
similarity index 100%
rename from sw/source/ui/inc/mailmrge.hxx
rename to sw/source/core/uibase/inc/mailmrge.hxx
diff --git a/sw/source/ui/inc/mediash.hxx b/sw/source/core/uibase/inc/mediash.hxx
similarity index 100%
rename from sw/source/ui/inc/mediash.hxx
rename to sw/source/core/uibase/inc/mediash.hxx
diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/core/uibase/inc/mergetbl.hxx
similarity index 100%
rename from sw/source/ui/inc/mergetbl.hxx
rename to sw/source/core/uibase/inc/mergetbl.hxx
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/core/uibase/inc/misc.hrc
similarity index 100%
rename from sw/source/ui/inc/misc.hrc
rename to sw/source/core/uibase/inc/misc.hrc
diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/core/uibase/inc/mmconfigitem.hxx
similarity index 100%
rename from sw/source/ui/inc/mmconfigitem.hxx
rename to sw/source/core/uibase/inc/mmconfigitem.hxx
diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/core/uibase/inc/multmrk.hxx
similarity index 100%
rename from sw/source/ui/inc/multmrk.hxx
rename to sw/source/core/uibase/inc/multmrk.hxx
diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/core/uibase/inc/navicfg.hxx
similarity index 100%
rename from sw/source/ui/inc/navicfg.hxx
rename to sw/source/core/uibase/inc/navicfg.hxx
diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/core/uibase/inc/navicont.hxx
similarity index 100%
rename from sw/source/ui/inc/navicont.hxx
rename to sw/source/core/uibase/inc/navicont.hxx
diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/core/uibase/inc/navipi.hxx
similarity index 100%
rename from sw/source/ui/inc/navipi.hxx
rename to sw/source/core/uibase/inc/navipi.hxx
diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/core/uibase/inc/navmgr.hxx
similarity index 100%
rename from sw/source/ui/inc/navmgr.hxx
rename to sw/source/core/uibase/inc/navmgr.hxx
diff --git a/sw/source/ui/inc/navsh.hxx b/sw/source/core/uibase/inc/navsh.hxx
similarity index 100%
rename from sw/source/ui/inc/navsh.hxx
rename to sw/source/core/uibase/inc/navsh.hxx
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/core/uibase/inc/num.hxx
similarity index 100%
rename from sw/source/ui/inc/num.hxx
rename to sw/source/core/uibase/inc/num.hxx
diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/core/uibase/inc/numberingtypelistbox.hxx
similarity index 100%
rename from sw/source/ui/inc/numberingtypelistbox.hxx
rename to sw/source/core/uibase/inc/numberingtypelistbox.hxx
diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/core/uibase/inc/numfmtlb.hxx
similarity index 100%
rename from sw/source/ui/inc/numfmtlb.hxx
rename to sw/source/core/uibase/inc/numfmtlb.hxx
diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/core/uibase/inc/numpara.hxx
similarity index 100%
rename from sw/source/ui/inc/numpara.hxx
rename to sw/source/core/uibase/inc/numpara.hxx
diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/core/uibase/inc/numprevw.hxx
similarity index 100%
rename from sw/source/ui/inc/numprevw.hxx
rename to sw/source/core/uibase/inc/numprevw.hxx
diff --git a/sw/source/ui/inc/olesh.hxx b/sw/source/core/uibase/inc/olesh.hxx
similarity index 100%
rename from sw/source/ui/inc/olesh.hxx
rename to sw/source/core/uibase/inc/olesh.hxx
diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/core/uibase/inc/olmenu.hxx
similarity index 100%
rename from sw/source/ui/inc/olmenu.hxx
rename to sw/source/core/uibase/inc/olmenu.hxx
diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/core/uibase/inc/optcomp.hxx
similarity index 100%
rename from sw/source/ui/inc/optcomp.hxx
rename to sw/source/core/uibase/inc/optcomp.hxx
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/core/uibase/inc/optload.hxx
similarity index 100%
rename from sw/source/ui/inc/optload.hxx
rename to sw/source/core/uibase/inc/optload.hxx
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/core/uibase/inc/optpage.hxx
similarity index 100%
rename from sw/source/ui/inc/optpage.hxx
rename to sw/source/core/uibase/inc/optpage.hxx
diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/core/uibase/inc/outline.hxx
similarity index 100%
rename from sw/source/ui/inc/outline.hxx
rename to sw/source/core/uibase/inc/outline.hxx
diff --git a/sw/source/ui/inc/pardlg.hxx b/sw/source/core/uibase/inc/pardlg.hxx
similarity index 100%
rename from sw/source/ui/inc/pardlg.hxx
rename to sw/source/core/uibase/inc/pardlg.hxx
diff --git a/sw/source/ui/inc/pattern.hxx b/sw/source/core/uibase/inc/pattern.hxx
similarity index 100%
rename from sw/source/ui/inc/pattern.hxx
rename to sw/source/core/uibase/inc/pattern.hxx
diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/core/uibase/inc/pgfnote.hxx
similarity index 100%
rename from sw/source/ui/inc/pgfnote.hxx
rename to sw/source/core/uibase/inc/pgfnote.hxx
diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/core/uibase/inc/pggrid.hxx
similarity index 100%
rename from sw/source/ui/inc/pggrid.hxx
rename to sw/source/core/uibase/inc/pggrid.hxx
diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/core/uibase/inc/popbox.hxx
similarity index 100%
rename from sw/source/ui/inc/popbox.hxx
rename to sw/source/core/uibase/inc/popbox.hxx
diff --git a/sw/source/ui/inc/popup.hrc b/sw/source/core/uibase/inc/popup.hrc
similarity index 100%
rename from sw/source/ui/inc/popup.hrc
rename to sw/source/core/uibase/inc/popup.hrc
diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/core/uibase/inc/prcntfld.hxx
similarity index 100%
rename from sw/source/ui/inc/prcntfld.hxx
rename to sw/source/core/uibase/inc/prcntfld.hxx
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx
similarity index 100%
rename from sw/source/ui/inc/pview.hxx
rename to sw/source/core/uibase/inc/pview.hxx
diff --git a/sw/source/ui/inc/redline_tmpl.hrc b/sw/source/core/uibase/inc/redline_tmpl.hrc
similarity index 100%
rename from sw/source/ui/inc/redline_tmpl.hrc
rename to sw/source/core/uibase/inc/redline_tmpl.hrc
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/core/uibase/inc/redlndlg.hxx
similarity index 100%
rename from sw/source/ui/inc/redlndlg.hxx
rename to sw/source/core/uibase/inc/redlndlg.hxx
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/core/uibase/inc/regionsw.hxx
similarity index 100%
rename from sw/source/ui/inc/regionsw.hxx
rename to sw/source/core/uibase/inc/regionsw.hxx
diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/core/uibase/inc/ribbar.hrc
similarity index 100%
rename from sw/source/ui/inc/ribbar.hrc
rename to sw/source/core/uibase/inc/ribbar.hrc
diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/core/uibase/inc/rowht.hxx
similarity index 100%
rename from sw/source/ui/inc/rowht.hxx
rename to sw/source/core/uibase/inc/rowht.hxx
diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/core/uibase/inc/scroll.hxx
similarity index 100%
rename from sw/source/ui/inc/scroll.hxx
rename to sw/source/core/uibase/inc/scroll.hxx
diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/core/uibase/inc/selglos.hxx
similarity index 100%
rename from sw/source/ui/inc/selglos.hxx
rename to sw/source/core/uibase/inc/selglos.hxx
diff --git a/sw/source/ui/inc/sharedconnection.hxx b/sw/source/core/uibase/inc/sharedconnection.hxx
similarity index 100%
rename from sw/source/ui/inc/sharedconnection.hxx
rename to sw/source/core/uibase/inc/sharedconnection.hxx
diff --git a/sw/source/ui/inc/shdwcrsr.hxx b/sw/source/core/uibase/inc/shdwcrsr.hxx
similarity index 100%
rename from sw/source/ui/inc/shdwcrsr.hxx
rename to sw/source/core/uibase/inc/shdwcrsr.hxx
diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/core/uibase/inc/shells.hrc
similarity index 100%
rename from sw/source/ui/inc/shells.hrc
rename to sw/source/core/uibase/inc/shells.hrc
diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/core/uibase/inc/splittbl.hxx
similarity index 100%
rename from sw/source/ui/inc/splittbl.hxx
rename to sw/source/core/uibase/inc/splittbl.hxx
diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/core/uibase/inc/srcedtw.hxx
similarity index 100%
rename from sw/source/ui/inc/srcedtw.hxx
rename to sw/source/core/uibase/inc/srcedtw.hxx
diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/core/uibase/inc/srcview.hxx
similarity index 100%
rename from sw/source/ui/inc/srcview.hxx
rename to sw/source/core/uibase/inc/srcview.hxx
diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/core/uibase/inc/srtdlg.hxx
similarity index 100%
rename from sw/source/ui/inc/srtdlg.hxx
rename to sw/source/core/uibase/inc/srtdlg.hxx
diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/core/uibase/inc/stmenu.hxx
similarity index 100%
rename from sw/source/ui/inc/stmenu.hxx
rename to sw/source/core/uibase/inc/stmenu.hxx
diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/core/uibase/inc/swcont.hxx
similarity index 100%
rename from sw/source/ui/inc/swcont.hxx
rename to sw/source/core/uibase/inc/swcont.hxx
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/core/uibase/inc/swdtflvr.hxx
similarity index 100%
rename from sw/source/ui/inc/swdtflvr.hxx
rename to sw/source/core/uibase/inc/swdtflvr.hxx
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/core/uibase/inc/swlbox.hxx
similarity index 100%
rename from sw/source/ui/inc/swlbox.hxx
rename to sw/source/core/uibase/inc/swlbox.hxx
diff --git a/sw/source/ui/inc/swmessdialog.hxx b/sw/source/core/uibase/inc/swmessdialog.hxx
similarity index 100%
rename from sw/source/ui/inc/swmessdialog.hxx
rename to sw/source/core/uibase/inc/swmessdialog.hxx
diff --git a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx
similarity index 100%
rename from sw/source/ui/inc/swmodalredlineacceptdlg.hxx
rename to sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx
diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/core/uibase/inc/swrenamexnameddlg.hxx
similarity index 100%
rename from sw/source/ui/inc/swrenamexnameddlg.hxx
rename to sw/source/core/uibase/inc/swrenamexnameddlg.hxx
diff --git a/sw/source/ui/inc/swruler.hxx b/sw/source/core/uibase/inc/swruler.hxx
similarity index 100%
rename from sw/source/ui/inc/swruler.hxx
rename to sw/source/core/uibase/inc/swruler.hxx
diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/core/uibase/inc/swtablerep.hxx
similarity index 100%
rename from sw/source/ui/inc/swtablerep.hxx
rename to sw/source/core/uibase/inc/swtablerep.hxx
diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/core/uibase/inc/swuiccoll.hxx
similarity index 100%
rename from sw/source/ui/inc/swuiccoll.hxx
rename to sw/source/core/uibase/inc/swuiccoll.hxx
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/core/uibase/inc/swuicnttab.hxx
similarity index 100%
rename from sw/source/ui/inc/swuicnttab.hxx
rename to sw/source/core/uibase/inc/swuicnttab.hxx
diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/core/uibase/inc/swuiidxmrk.hxx
similarity index 100%
rename from sw/source/ui/inc/swuiidxmrk.hxx
rename to sw/source/core/uibase/inc/swuiidxmrk.hxx
diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/core/uibase/inc/swuipardlg.hxx
similarity index 100%
rename from sw/source/ui/inc/swuipardlg.hxx
rename to sw/source/core/uibase/inc/swuipardlg.hxx
diff --git a/sw/source/ui/inc/swvset.hxx b/sw/source/core/uibase/inc/swvset.hxx
similarity index 100%
rename from sw/source/ui/inc/swvset.hxx
rename to sw/source/core/uibase/inc/swvset.hxx
diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/core/uibase/inc/swwrtshitem.hxx
similarity index 100%
rename from sw/source/ui/inc/swwrtshitem.hxx
rename to sw/source/core/uibase/inc/swwrtshitem.hxx
diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/core/uibase/inc/syncbtn.hxx
similarity index 100%
rename from sw/source/ui/inc/syncbtn.hxx
rename to sw/source/core/uibase/inc/syncbtn.hxx
diff --git a/sw/source/ui/inc/table.hrc b/sw/source/core/uibase/inc/table.hrc
similarity index 100%
rename from sw/source/ui/inc/table.hrc
rename to sw/source/core/uibase/inc/table.hrc
diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/core/uibase/inc/tabledlg.hxx
similarity index 100%
rename from sw/source/ui/inc/tabledlg.hxx
rename to sw/source/core/uibase/inc/tabledlg.hxx
diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/core/uibase/inc/tablemgr.hxx
similarity index 100%
rename from sw/source/ui/inc/tablemgr.hxx
rename to sw/source/core/uibase/inc/tablemgr.hxx
diff --git a/sw/source/ui/inc/tabsh.hxx b/sw/source/core/uibase/inc/tabsh.hxx
similarity index 100%
rename from sw/source/ui/inc/tabsh.hxx
rename to sw/source/core/uibase/inc/tabsh.hxx
diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/core/uibase/inc/tautofmt.hxx
similarity index 100%
rename from sw/source/ui/inc/tautofmt.hxx
rename to sw/source/core/uibase/inc/tautofmt.hxx
diff --git a/sw/source/ui/inc/tblctrl.hxx b/sw/source/core/uibase/inc/tblctrl.hxx
similarity index 100%
rename from sw/source/ui/inc/tblctrl.hxx
rename to sw/source/core/uibase/inc/tblctrl.hxx
diff --git a/sw/source/ui/inc/tblnumfm.hxx b/sw/source/core/uibase/inc/tblnumfm.hxx
similarity index 100%
rename from sw/source/ui/inc/tblnumfm.hxx
rename to sw/source/core/uibase/inc/tblnumfm.hxx
diff --git a/sw/source/ui/inc/tbxanchr.hxx b/sw/source/core/uibase/inc/tbxanchr.hxx
similarity index 100%
rename from sw/source/ui/inc/tbxanchr.hxx
rename to sw/source/core/uibase/inc/tbxanchr.hxx
diff --git a/sw/source/ui/inc/textsh.hxx b/sw/source/core/uibase/inc/textsh.hxx
similarity index 100%
rename from sw/source/ui/inc/textsh.hxx
rename to sw/source/core/uibase/inc/textsh.hxx
diff --git a/sw/source/ui/inc/titlepage.hxx b/sw/source/core/uibase/inc/titlepage.hxx
similarity index 100%
rename from sw/source/ui/inc/titlepage.hxx
rename to sw/source/core/uibase/inc/titlepage.hxx
diff --git a/sw/source/ui/inc/tmpdlg.hxx b/sw/source/core/uibase/inc/tmpdlg.hxx
similarity index 100%
rename from sw/source/ui/inc/tmpdlg.hxx
rename to sw/source/core/uibase/inc/tmpdlg.hxx
diff --git a/sw/source/ui/inc/tmplctrl.hxx b/sw/source/core/uibase/inc/tmplctrl.hxx
similarity index 100%
rename from sw/source/ui/inc/tmplctrl.hxx
rename to sw/source/core/uibase/inc/tmplctrl.hxx
diff --git a/sw/source/ui/inc/toolbox.hrc b/sw/source/core/uibase/inc/toolbox.hrc
similarity index 100%
rename from sw/source/ui/inc/toolbox.hrc
rename to sw/source/core/uibase/inc/toolbox.hrc
diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/core/uibase/inc/toxmgr.hxx
similarity index 100%
rename from sw/source/ui/inc/toxmgr.hxx
rename to sw/source/core/uibase/inc/toxmgr.hxx
diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/core/uibase/inc/uiborder.hxx
similarity index 100%
rename from sw/source/ui/inc/uiborder.hxx
rename to sw/source/core/uibase/inc/uiborder.hxx
diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/core/uibase/inc/uiitems.hxx
similarity index 100%
rename from sw/source/ui/inc/uiitems.hxx
rename to sw/source/core/uibase/inc/uiitems.hxx
diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/core/uibase/inc/uinums.hxx
similarity index 100%
rename from sw/source/ui/inc/uinums.hxx
rename to sw/source/core/uibase/inc/uinums.hxx
diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/core/uibase/inc/uitool.hxx
similarity index 100%
rename from sw/source/ui/inc/uitool.hxx
rename to sw/source/core/uibase/inc/uitool.hxx
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/core/uibase/inc/uivwimp.hxx
similarity index 100%
rename from sw/source/ui/inc/uivwimp.hxx
rename to sw/source/core/uibase/inc/uivwimp.hxx
diff --git a/sw/source/ui/inc/unoatxt.hxx b/sw/source/core/uibase/inc/unoatxt.hxx
similarity index 100%
rename from sw/source/ui/inc/unoatxt.hxx
rename to sw/source/core/uibase/inc/unoatxt.hxx
diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/core/uibase/inc/unodispatch.hxx
similarity index 100%
rename from sw/source/ui/inc/unodispatch.hxx
rename to sw/source/core/uibase/inc/unodispatch.hxx
diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/core/uibase/inc/unomailmerge.hxx
similarity index 100%
rename from sw/source/ui/inc/unomailmerge.hxx
rename to sw/source/core/uibase/inc/unomailmerge.hxx
diff --git a/sw/source/ui/inc/unomod.hxx b/sw/source/core/uibase/inc/unomod.hxx
similarity index 100%
rename from sw/source/ui/inc/unomod.hxx
rename to sw/source/core/uibase/inc/unomod.hxx
diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/core/uibase/inc/unotools.hxx
similarity index 100%
rename from sw/source/ui/inc/unotools.hxx
rename to sw/source/core/uibase/inc/unotools.hxx
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/core/uibase/inc/unotxvw.hxx
similarity index 100%
rename from sw/source/ui/inc/unotxvw.hxx
rename to sw/source/core/uibase/inc/unotxvw.hxx
diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/core/uibase/inc/usrpref.hxx
similarity index 100%
rename from sw/source/ui/inc/usrpref.hxx
rename to sw/source/core/uibase/inc/usrpref.hxx
diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/core/uibase/inc/utlui.hrc
similarity index 100%
rename from sw/source/ui/inc/utlui.hrc
rename to sw/source/core/uibase/inc/utlui.hrc
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx
similarity index 100%
rename from sw/source/ui/inc/view.hxx
rename to sw/source/core/uibase/inc/view.hxx
diff --git a/sw/source/ui/inc/viewlayoutctrl.hxx b/sw/source/core/uibase/inc/viewlayoutctrl.hxx
similarity index 100%
rename from sw/source/ui/inc/viewlayoutctrl.hxx
rename to sw/source/core/uibase/inc/viewlayoutctrl.hxx
diff --git a/sw/source/ui/inc/web.hrc b/sw/source/core/uibase/inc/web.hrc
similarity index 100%
rename from sw/source/ui/inc/web.hrc
rename to sw/source/core/uibase/inc/web.hrc
diff --git a/sw/source/ui/inc/wformsh.hxx b/sw/source/core/uibase/inc/wformsh.hxx
similarity index 100%
rename from sw/source/ui/inc/wformsh.hxx
rename to sw/source/core/uibase/inc/wformsh.hxx
diff --git a/sw/source/ui/inc/wfrmsh.hxx b/sw/source/core/uibase/inc/wfrmsh.hxx
similarity index 100%
rename from sw/source/ui/inc/wfrmsh.hxx
rename to sw/source/core/uibase/inc/wfrmsh.hxx
diff --git a/sw/source/ui/inc/wgrfsh.hxx b/sw/source/core/uibase/inc/wgrfsh.hxx
similarity index 100%
rename from sw/source/ui/inc/wgrfsh.hxx
rename to sw/source/core/uibase/inc/wgrfsh.hxx
diff --git a/sw/source/ui/inc/wlistsh.hxx b/sw/source/core/uibase/inc/wlistsh.hxx
similarity index 100%
rename from sw/source/ui/inc/wlistsh.hxx
rename to sw/source/core/uibase/inc/wlistsh.hxx
diff --git a/sw/source/ui/inc/wolesh.hxx b/sw/source/core/uibase/inc/wolesh.hxx
similarity index 100%
rename from sw/source/ui/inc/wolesh.hxx
rename to sw/source/core/uibase/inc/wolesh.hxx
diff --git a/sw/source/ui/inc/wordcountctrl.hxx b/sw/source/core/uibase/inc/wordcountctrl.hxx
similarity index 100%
rename from sw/source/ui/inc/wordcountctrl.hxx
rename to sw/source/core/uibase/inc/wordcountctrl.hxx
diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/core/uibase/inc/wordcountdialog.hxx
similarity index 100%
rename from sw/source/ui/inc/wordcountdialog.hxx
rename to sw/source/core/uibase/inc/wordcountdialog.hxx
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/core/uibase/inc/workctrl.hxx
similarity index 100%
rename from sw/source/ui/inc/workctrl.hxx
rename to sw/source/core/uibase/inc/workctrl.hxx
diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/core/uibase/inc/wrap.hxx
similarity index 100%
rename from sw/source/ui/inc/wrap.hxx
rename to sw/source/core/uibase/inc/wrap.hxx
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/core/uibase/inc/wrtsh.hxx
similarity index 100%
rename from sw/source/ui/inc/wrtsh.hxx
rename to sw/source/core/uibase/inc/wrtsh.hxx
diff --git a/sw/source/ui/inc/wtabsh.hxx b/sw/source/core/uibase/inc/wtabsh.hxx
similarity index 100%
rename from sw/source/ui/inc/wtabsh.hxx
rename to sw/source/core/uibase/inc/wtabsh.hxx
diff --git a/sw/source/ui/inc/wtextsh.hxx b/sw/source/core/uibase/inc/wtextsh.hxx
similarity index 100%
rename from sw/source/ui/inc/wtextsh.hxx
rename to sw/source/core/uibase/inc/wtextsh.hxx
diff --git a/sw/source/ui/inc/wview.hxx b/sw/source/core/uibase/inc/wview.hxx
similarity index 100%
rename from sw/source/ui/inc/wview.hxx
rename to sw/source/core/uibase/inc/wview.hxx
diff --git a/sw/source/ui/inc/zoomctrl.hxx b/sw/source/core/uibase/inc/zoomctrl.hxx
similarity index 100%
rename from sw/source/ui/inc/zoomctrl.hxx
rename to sw/source/core/uibase/inc/zoomctrl.hxx
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/core/uibase/index/idxmrk.cxx
similarity index 100%
rename from sw/source/ui/index/idxmrk.cxx
rename to sw/source/core/uibase/index/idxmrk.cxx
diff --git a/sw/source/ui/index/idxmrk.hrc b/sw/source/core/uibase/index/idxmrk.hrc
similarity index 100%
rename from sw/source/ui/index/idxmrk.hrc
rename to sw/source/core/uibase/index/idxmrk.hrc
diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/core/uibase/index/toxmgr.cxx
similarity index 100%
rename from sw/source/ui/index/toxmgr.cxx
rename to sw/source/core/uibase/index/toxmgr.cxx
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/core/uibase/lingu/hhcwrp.cxx
similarity index 100%
rename from sw/source/ui/lingu/hhcwrp.cxx
rename to sw/source/core/uibase/lingu/hhcwrp.cxx
diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/core/uibase/lingu/hyp.cxx
similarity index 100%
rename from sw/source/ui/lingu/hyp.cxx
rename to sw/source/core/uibase/lingu/hyp.cxx
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/core/uibase/lingu/olmenu.cxx
similarity index 100%
rename from sw/source/ui/lingu/olmenu.cxx
rename to sw/source/core/uibase/lingu/olmenu.cxx
diff --git a/sw/source/ui/lingu/olmenu.hrc b/sw/source/core/uibase/lingu/olmenu.hrc
similarity index 100%
rename from sw/source/ui/lingu/olmenu.hrc
rename to sw/source/core/uibase/lingu/olmenu.hrc
diff --git a/sw/source/ui/lingu/olmenu.src b/sw/source/core/uibase/lingu/olmenu.src
similarity index 100%
rename from sw/source/ui/lingu/olmenu.src
rename to sw/source/core/uibase/lingu/olmenu.src
diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/core/uibase/lingu/sdrhhcwrap.cxx
similarity index 100%
rename from sw/source/ui/lingu/sdrhhcwrap.cxx
rename to sw/source/core/uibase/lingu/sdrhhcwrap.cxx
diff --git a/sw/source/ui/lingu/sdrhhcwrap.hxx b/sw/source/core/uibase/lingu/sdrhhcwrap.hxx
similarity index 100%
rename from sw/source/ui/lingu/sdrhhcwrap.hxx
rename to sw/source/core/uibase/lingu/sdrhhcwrap.hxx
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/core/uibase/misc/glosdoc.cxx
similarity index 100%
rename from sw/source/ui/misc/glosdoc.cxx
rename to sw/source/core/uibase/misc/glosdoc.cxx
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/core/uibase/misc/glshell.cxx
similarity index 100%
rename from sw/source/ui/misc/glshell.cxx
rename to sw/source/core/uibase/misc/glshell.cxx
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/core/uibase/misc/numberingtypelistbox.cxx
similarity index 100%
rename from sw/source/ui/misc/numberingtypelistbox.cxx
rename to sw/source/core/uibase/misc/numberingtypelistbox.cxx
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/core/uibase/misc/redlndlg.cxx
similarity index 100%
rename from sw/source/ui/misc/redlndlg.cxx
rename to sw/source/core/uibase/misc/redlndlg.cxx
diff --git a/sw/source/ui/misc/redlndlg.hrc b/sw/source/core/uibase/misc/redlndlg.hrc
similarity index 100%
rename from sw/source/ui/misc/redlndlg.hrc
rename to sw/source/core/uibase/misc/redlndlg.hrc
diff --git a/sw/source/ui/misc/redlndlg.src b/sw/source/core/uibase/misc/redlndlg.src
similarity index 100%
rename from sw/source/ui/misc/redlndlg.src
rename to sw/source/core/uibase/misc/redlndlg.src
diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/core/uibase/misc/swruler.cxx
similarity index 100%
rename from sw/source/ui/misc/swruler.cxx
rename to sw/source/core/uibase/misc/swruler.cxx
diff --git a/sw/source/ui/ribbar/conarc.cxx b/sw/source/core/uibase/ribbar/conarc.cxx
similarity index 100%
rename from sw/source/ui/ribbar/conarc.cxx
rename to sw/source/core/uibase/ribbar/conarc.cxx
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/core/uibase/ribbar/concustomshape.cxx
similarity index 100%
rename from sw/source/ui/ribbar/concustomshape.cxx
rename to sw/source/core/uibase/ribbar/concustomshape.cxx
diff --git a/sw/source/ui/ribbar/conform.cxx b/sw/source/core/uibase/ribbar/conform.cxx
similarity index 100%
rename from sw/source/ui/ribbar/conform.cxx
rename to sw/source/core/uibase/ribbar/conform.cxx
diff --git a/sw/source/ui/ribbar/conpoly.cxx b/sw/source/core/uibase/ribbar/conpoly.cxx
similarity index 100%
rename from sw/source/ui/ribbar/conpoly.cxx
rename to sw/source/core/uibase/ribbar/conpoly.cxx
diff --git a/sw/source/ui/ribbar/conrect.cxx b/sw/source/core/uibase/ribbar/conrect.cxx
similarity index 100%
rename from sw/source/ui/ribbar/conrect.cxx
rename to sw/source/core/uibase/ribbar/conrect.cxx
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/core/uibase/ribbar/drawbase.cxx
similarity index 100%
rename from sw/source/ui/ribbar/drawbase.cxx
rename to sw/source/core/uibase/ribbar/drawbase.cxx
diff --git a/sw/source/ui/ribbar/dselect.cxx b/sw/source/core/uibase/ribbar/dselect.cxx
similarity index 100%
rename from sw/source/ui/ribbar/dselect.cxx
rename to sw/source/core/uibase/ribbar/dselect.cxx
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/core/uibase/ribbar/inputwin.cxx
similarity index 100%
rename from sw/source/ui/ribbar/inputwin.cxx
rename to sw/source/core/uibase/ribbar/inputwin.cxx
diff --git a/sw/source/ui/ribbar/inputwin.hrc b/sw/source/core/uibase/ribbar/inputwin.hrc
similarity index 100%
rename from sw/source/ui/ribbar/inputwin.hrc
rename to sw/source/core/uibase/ribbar/inputwin.hrc
diff --git a/sw/source/ui/ribbar/inputwin.src b/sw/source/core/uibase/ribbar/inputwin.src
similarity index 100%
rename from sw/source/ui/ribbar/inputwin.src
rename to sw/source/core/uibase/ribbar/inputwin.src
diff --git a/sw/source/ui/ribbar/tblctrl.cxx b/sw/source/core/uibase/ribbar/tblctrl.cxx
similarity index 100%
rename from sw/source/ui/ribbar/tblctrl.cxx
rename to sw/source/core/uibase/ribbar/tblctrl.cxx
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/core/uibase/ribbar/tbxanchr.cxx
similarity index 100%
rename from sw/source/ui/ribbar/tbxanchr.cxx
rename to sw/source/core/uibase/ribbar/tbxanchr.cxx
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/core/uibase/ribbar/workctrl.cxx
similarity index 100%
rename from sw/source/ui/ribbar/workctrl.cxx
rename to sw/source/core/uibase/ribbar/workctrl.cxx
diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/core/uibase/ribbar/workctrl.hrc
similarity index 100%
rename from sw/source/ui/ribbar/workctrl.hrc
rename to sw/source/core/uibase/ribbar/workctrl.hrc
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/core/uibase/ribbar/workctrl.src
similarity index 100%
rename from sw/source/ui/ribbar/workctrl.src
rename to sw/source/core/uibase/ribbar/workctrl.src
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/core/uibase/shells/annotsh.cxx
similarity index 100%
rename from sw/source/ui/shells/annotsh.cxx
rename to sw/source/core/uibase/shells/annotsh.cxx
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/core/uibase/shells/basesh.cxx
similarity index 100%
rename from sw/source/ui/shells/basesh.cxx
rename to sw/source/core/uibase/shells/basesh.cxx
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/core/uibase/shells/beziersh.cxx
similarity index 100%
rename from sw/source/ui/shells/beziersh.cxx
rename to sw/source/core/uibase/shells/beziersh.cxx
diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/core/uibase/shells/drawdlg.cxx
similarity index 100%
rename from sw/source/ui/shells/drawdlg.cxx
rename to sw/source/core/uibase/shells/drawdlg.cxx
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/core/uibase/shells/drawsh.cxx
similarity index 100%
rename from sw/source/ui/shells/drawsh.cxx
rename to sw/source/core/uibase/shells/drawsh.cxx
diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/core/uibase/shells/drformsh.cxx
similarity index 100%
rename from sw/source/ui/shells/drformsh.cxx
rename to sw/source/core/uibase/shells/drformsh.cxx
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/core/uibase/shells/drwbassh.cxx
similarity index 100%
rename from sw/source/ui/shells/drwbassh.cxx
rename to sw/source/core/uibase/shells/drwbassh.cxx
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/core/uibase/shells/drwtxtex.cxx
similarity index 100%
rename from sw/source/ui/shells/drwtxtex.cxx
rename to sw/source/core/uibase/shells/drwtxtex.cxx
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/core/uibase/shells/drwtxtsh.cxx
similarity index 100%
rename from sw/source/ui/shells/drwtxtsh.cxx
rename to sw/source/core/uibase/shells/drwtxtsh.cxx
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/core/uibase/shells/frmsh.cxx
similarity index 100%
rename from sw/source/ui/shells/frmsh.cxx
rename to sw/source/core/uibase/shells/frmsh.cxx
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/core/uibase/shells/grfsh.cxx
similarity index 100%
rename from sw/source/ui/shells/grfsh.cxx
rename to sw/source/core/uibase/shells/grfsh.cxx
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/core/uibase/shells/grfshex.cxx
similarity index 100%
rename from sw/source/ui/shells/grfshex.cxx
rename to sw/source/core/uibase/shells/grfshex.cxx
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/core/uibase/shells/langhelper.cxx
similarity index 100%
rename from sw/source/ui/shells/langhelper.cxx
rename to sw/source/core/uibase/shells/langhelper.cxx
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/core/uibase/shells/listsh.cxx
similarity index 100%
rename from sw/source/ui/shells/listsh.cxx
rename to sw/source/core/uibase/shells/listsh.cxx
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/core/uibase/shells/mediash.cxx
similarity index 100%
rename from sw/source/ui/shells/mediash.cxx
rename to sw/source/core/uibase/shells/mediash.cxx
diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/core/uibase/shells/navsh.cxx
similarity index 100%
rename from sw/source/ui/shells/navsh.cxx
rename to sw/source/core/uibase/shells/navsh.cxx
diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/core/uibase/shells/olesh.cxx
similarity index 100%
rename from sw/source/ui/shells/olesh.cxx
rename to sw/source/core/uibase/shells/olesh.cxx
diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/core/uibase/shells/slotadd.cxx
similarity index 100%
rename from sw/source/ui/shells/slotadd.cxx
rename to sw/source/core/uibase/shells/slotadd.cxx
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/core/uibase/shells/tabsh.cxx
similarity index 100%
rename from sw/source/ui/shells/tabsh.cxx
rename to sw/source/core/uibase/shells/tabsh.cxx
diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/core/uibase/shells/textdrw.cxx
similarity index 100%
rename from sw/source/ui/shells/textdrw.cxx
rename to sw/source/core/uibase/shells/textdrw.cxx
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/core/uibase/shells/textfld.cxx
similarity index 100%
rename from sw/source/ui/shells/textfld.cxx
rename to sw/source/core/uibase/shells/textfld.cxx
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/core/uibase/shells/textglos.cxx
similarity index 100%
rename from sw/source/ui/shells/textglos.cxx
rename to sw/source/core/uibase/shells/textglos.cxx
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/core/uibase/shells/textidx.cxx
similarity index 100%
rename from sw/source/ui/shells/textidx.cxx
rename to sw/source/core/uibase/shells/textidx.cxx
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/core/uibase/shells/textsh.cxx
similarity index 100%
rename from sw/source/ui/shells/textsh.cxx
rename to sw/source/core/uibase/shells/textsh.cxx
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/core/uibase/shells/textsh1.cxx
similarity index 100%
rename from sw/source/ui/shells/textsh1.cxx
rename to sw/source/core/uibase/shells/textsh1.cxx
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/core/uibase/shells/textsh2.cxx
similarity index 100%
rename from sw/source/ui/shells/textsh2.cxx
rename to sw/source/core/uibase/shells/textsh2.cxx
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/core/uibase/shells/txtattr.cxx
similarity index 100%
rename from sw/source/ui/shells/txtattr.cxx
rename to sw/source/core/uibase/shells/txtattr.cxx
diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/core/uibase/shells/txtcrsr.cxx
similarity index 100%
rename from sw/source/ui/shells/txtcrsr.cxx
rename to sw/source/core/uibase/shells/txtcrsr.cxx
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/core/uibase/shells/txtnum.cxx
similarity index 100%
rename from sw/source/ui/shells/txtnum.cxx
rename to sw/source/core/uibase/shells/txtnum.cxx
diff --git a/sw/source/ui/sidebar/PageColumnControl.cxx b/sw/source/core/uibase/sidebar/PageColumnControl.cxx
similarity index 100%
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list