[Libreoffice-commits] core.git: 9 commits - configure.ac svx/source 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/README sw/source
Michael Stahl
mstahl at redhat.com
Tue May 27 02:18:25 PDT 2014
configure.ac | 15
svx/source/tbxctrls/tbcontrl.cxx | 2
svx/source/tbxctrls/tbxcolorupdate.cxx | 2
sw/AllLangResTarget_sw.mk | 40
sw/CppunitTest_sw_htmlexport.mk | 2
sw/CppunitTest_sw_odfimport.mk | 2
sw/CppunitTest_sw_uiwriter.mk | 2
sw/Executable_tiledrendering.mk | 2
sw/Library_sw.mk | 420
sw/Library_swui.mk | 4
sw/Library_vbaswobj.mk | 4
sw/README | 3
sw/source/core/access/accembedded.cxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/doc/docfly.cxx | 2
sw/source/core/uibase/app/appenv.cxx | 508 -
sw/source/core/uibase/app/apphdl.cxx | 898 --
sw/source/core/uibase/app/applab.cxx | 413
sw/source/core/uibase/app/appopt.cxx | 528 -
sw/source/core/uibase/app/docsh.cxx | 1328 ---
sw/source/core/uibase/app/docsh2.cxx | 1584 ---
sw/source/core/uibase/app/docshdrw.cxx | 55
sw/source/core/uibase/app/docshini.cxx | 683 -
sw/source/core/uibase/app/docst.cxx | 1279 --
sw/source/core/uibase/app/docstyle.cxx | 2980 ------
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 | 421
sw/source/core/uibase/app/swwait.cxx | 84
sw/source/core/uibase/cctrl/actctrl.cxx | 125
sw/source/core/uibase/cctrl/popbox.cxx | 63
sw/source/core/uibase/cctrl/swlbox.cxx | 137
sw/source/core/uibase/chrdlg/ccoll.cxx | 182
sw/source/core/uibase/config/barcfg.cxx | 127
sw/source/core/uibase/config/caption.cxx | 76
sw/source/core/uibase/config/cfgitems.cxx | 348
sw/source/core/uibase/config/dbconfig.cxx | 116
sw/source/core/uibase/config/fontcfg.cxx | 320
sw/source/core/uibase/config/modcfg.cxx | 1398 ---
sw/source/core/uibase/config/prtopt.cxx | 172
sw/source/core/uibase/config/uinums.cxx | 562 -
sw/source/core/uibase/config/usrpref.cxx | 592 -
sw/source/core/uibase/config/viewopt.cxx | 550 -
sw/source/core/uibase/dbui/dbmgr.cxx | 2943 ------
sw/source/core/uibase/dbui/dbtree.cxx | 522 -
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 | 208
sw/source/core/uibase/dbui/mailmergehelper.cxx | 894 --
sw/source/core/uibase/dbui/mmconfigitem.cxx | 1741 ---
sw/source/core/uibase/dbui/swdbtoolsclient.cxx | 232
sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx | 844 -
sw/source/core/uibase/dialog/regionsw.cxx | 239
sw/source/core/uibase/dialog/regionsw.hrc | 42
sw/source/core/uibase/dialog/regionsw.src | 69
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 | 751 -
sw/source/core/uibase/dochdl/swdtflvr.cxx | 3798 --------
sw/source/core/uibase/docvw/AnchorOverlayObject.cxx | 449 -
sw/source/core/uibase/docvw/AnchorOverlayObject.hxx | 133
sw/source/core/uibase/docvw/AnnotationMenuButton.cxx | 205
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 | 2029 ----
sw/source/core/uibase/docvw/ShadowOverlayObject.cxx | 252
sw/source/core/uibase/docvw/ShadowOverlayObject.hxx | 70
sw/source/core/uibase/docvw/SidebarTxtControl.cxx | 433
sw/source/core/uibase/docvw/SidebarTxtControl.hxx | 77
sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx | 293
sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx | 46
sw/source/core/uibase/docvw/SidebarWin.cxx | 1420 ---
sw/source/core/uibase/docvw/SidebarWinAcc.cxx | 143
sw/source/core/uibase/docvw/SidebarWinAcc.hxx | 57
sw/source/core/uibase/docvw/annotation.hrc | 44
sw/source/core/uibase/docvw/docvw.hrc | 89
sw/source/core/uibase/docvw/docvw.src | 307
sw/source/core/uibase/docvw/edtdd.cxx | 495 -
sw/source/core/uibase/docvw/edtwin.cxx | 6147 --------------
sw/source/core/uibase/docvw/edtwin2.cxx | 465 -
sw/source/core/uibase/docvw/edtwin3.cxx | 166
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 | 1715 ---
sw/source/core/uibase/fldui/fldwrap.cxx | 155
sw/source/core/uibase/fldui/xfldui.cxx | 165
sw/source/core/uibase/frmdlg/colex.cxx | 586 -
sw/source/core/uibase/frmdlg/colmgr.cxx | 139
sw/source/core/uibase/frmdlg/frmmgr.cxx | 589 -
sw/source/core/uibase/globdoc/globdoc.cxx | 73
sw/source/core/uibase/inc/DashedLine.hxx | 30
sw/source/core/uibase/inc/DropDownFieldDialog.hxx | 56
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 | 84
sw/source/core/uibase/inc/addrdlg.hxx | 32
sw/source/core/uibase/inc/annotsh.hxx | 81
sw/source/core/uibase/inc/app.hrc | 116
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 | 120
sw/source/core/uibase/inc/beziersh.hxx | 43
sw/source/core/uibase/inc/bmpwin.hxx | 54
sw/source/core/uibase/inc/bookctrl.hxx | 45
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 | 216
sw/source/core/uibase/inc/changedb.hxx | 66
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 | 84
sw/source/core/uibase/inc/colex.hxx | 109
sw/source/core/uibase/inc/colmgr.hxx | 126
sw/source/core/uibase/inc/column.hxx | 204
sw/source/core/uibase/inc/conarc.hxx | 43
sw/source/core/uibase/inc/concustomshape.hxx | 58
sw/source/core/uibase/inc/condedit.hxx | 49
sw/source/core/uibase/inc/conform.hxx | 38
sw/source/core/uibase/inc/conpoly.hxx | 42
sw/source/core/uibase/inc/conrect.hxx | 46
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 | 68
sw/source/core/uibase/inc/drawbase.hxx | 74
sw/source/core/uibase/inc/drawsh.hxx | 55
sw/source/core/uibase/inc/drformsh.hxx | 46
sw/source/core/uibase/inc/drpcps.hxx | 99
sw/source/core/uibase/inc/drwbassh.hxx | 62
sw/source/core/uibase/inc/drwtxtsh.hxx | 86
sw/source/core/uibase/inc/dselect.hxx | 38
sw/source/core/uibase/inc/edtwin.hxx | 295
sw/source/core/uibase/inc/envimg.hxx | 87
sw/source/core/uibase/inc/envlop.hxx | 119
sw/source/core/uibase/inc/fldedt.hxx | 55
sw/source/core/uibase/inc/fldmgr.hxx | 213
sw/source/core/uibase/inc/fldtdlg.hxx | 66
sw/source/core/uibase/inc/fldwrap.hxx | 53
sw/source/core/uibase/inc/fontcfg.hxx | 112
sw/source/core/uibase/inc/formatclipboard.hxx | 92
sw/source/core/uibase/inc/formedt.hxx | 90
sw/source/core/uibase/inc/frmdlg.hxx | 68
sw/source/core/uibase/inc/frmmgr.hxx | 188
sw/source/core/uibase/inc/frmpage.hxx | 326
sw/source/core/uibase/inc/frmsh.hxx | 56
sw/source/core/uibase/inc/frmui.hrc | 69
sw/source/core/uibase/inc/globals.h | 31
sw/source/core/uibase/inc/globdoc.hrc | 40
sw/source/core/uibase/inc/glosbib.hxx | 116
sw/source/core/uibase/inc/glosdoc.hxx | 134
sw/source/core/uibase/inc/gloshdl.hxx | 103
sw/source/core/uibase/inc/gloslst.hxx | 82
sw/source/core/uibase/inc/glossary.hxx | 167
sw/source/core/uibase/inc/glshell.hxx | 93
sw/source/core/uibase/inc/grfsh.hxx | 46
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 | 60
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 | 86
sw/source/core/uibase/inc/label.hxx | 93
sw/source/core/uibase/inc/labelcfg.hxx | 61
sw/source/core/uibase/inc/labimg.hxx | 123
sw/source/core/uibase/inc/langhelper.hxx | 62
sw/source/core/uibase/inc/linenum.hxx | 64
sw/source/core/uibase/inc/listsh.hxx | 43
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 | 299
sw/source/core/uibase/inc/mailmergewizard.hxx | 97
sw/source/core/uibase/inc/mailmrge.hxx | 173
sw/source/core/uibase/inc/mediash.hxx | 42
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 | 49
sw/source/core/uibase/inc/navicfg.hxx | 109
sw/source/core/uibase/inc/navicont.hxx | 54
sw/source/core/uibase/inc/navipi.hxx | 181
sw/source/core/uibase/inc/navmgr.hxx | 56
sw/source/core/uibase/inc/navsh.hxx | 34
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 | 82
sw/source/core/uibase/inc/numprevw.hxx | 71
sw/source/core/uibase/inc/olesh.hxx | 39
sw/source/core/uibase/inc/olmenu.hxx | 91
sw/source/core/uibase/inc/optcomp.hxx | 74
sw/source/core/uibase/inc/optload.hxx | 178
sw/source/core/uibase/inc/optpage.hxx | 428
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 | 75
sw/source/core/uibase/inc/pggrid.hxx | 99
sw/source/core/uibase/inc/popbox.hxx | 57
sw/source/core/uibase/inc/popup.hrc | 48
sw/source/core/uibase/inc/prcntfld.hxx | 111
sw/source/core/uibase/inc/pview.hxx | 305
sw/source/core/uibase/inc/redline_tmpl.hrc | 39
sw/source/core/uibase/inc/redlndlg.hxx | 162
sw/source/core/uibase/inc/regionsw.hxx | 299
sw/source/core/uibase/inc/ribbar.hrc | 95
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 | 98
sw/source/core/uibase/inc/splittbl.hxx | 49
sw/source/core/uibase/inc/srcedtw.hxx | 157
sw/source/core/uibase/inc/srcview.hxx | 93
sw/source/core/uibase/inc/srtdlg.hxx | 92
sw/source/core/uibase/inc/stmenu.hxx | 72
sw/source/core/uibase/inc/swcont.hxx | 99
sw/source/core/uibase/inc/swdtflvr.hxx | 213
sw/source/core/uibase/inc/swlbox.hxx | 80
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 | 252
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 | 34
sw/source/core/uibase/inc/tabledlg.hxx | 47
sw/source/core/uibase/inc/tablemgr.hxx | 88
sw/source/core/uibase/inc/tabsh.hxx | 57
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 | 88
sw/source/core/uibase/inc/titlepage.hxx | 70
sw/source/core/uibase/inc/tmpdlg.hxx | 89
sw/source/core/uibase/inc/tmplctrl.hxx | 44
sw/source/core/uibase/inc/toxmgr.hxx | 306
sw/source/core/uibase/inc/uiborder.hxx | 41
sw/source/core/uibase/inc/uiitems.hxx | 117
sw/source/core/uibase/inc/uinums.hxx | 122
sw/source/core/uibase/inc/uitool.hxx | 109
sw/source/core/uibase/inc/uivwimp.hxx | 179
sw/source/core/uibase/inc/unoatxt.hxx | 283
sw/source/core/uibase/inc/unodispatch.hxx | 128
sw/source/core/uibase/inc/unomailmerge.hxx | 179
sw/source/core/uibase/inc/unomod.hxx | 179
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 | 183
sw/source/core/uibase/inc/view.hxx | 686 -
sw/source/core/uibase/inc/viewlayoutctrl.hxx | 45
sw/source/core/uibase/inc/web.hrc | 45
sw/source/core/uibase/inc/wformsh.hxx | 42
sw/source/core/uibase/inc/wfrmsh.hxx | 42
sw/source/core/uibase/inc/wgrfsh.hxx | 40
sw/source/core/uibase/inc/wlistsh.hxx | 42
sw/source/core/uibase/inc/wolesh.hxx | 40
sw/source/core/uibase/inc/wordcountctrl.hxx | 33
sw/source/core/uibase/inc/wordcountdialog.hxx | 83
sw/source/core/uibase/inc/workctrl.hxx | 185
sw/source/core/uibase/inc/wrap.hxx | 114
sw/source/core/uibase/inc/wrtsh.hxx | 644 -
sw/source/core/uibase/inc/wtabsh.hxx | 41
sw/source/core/uibase/inc/wtextsh.hxx | 42
sw/source/core/uibase/inc/wview.hxx | 46
sw/source/core/uibase/inc/zoomctrl.hxx | 43
sw/source/core/uibase/index/idxmrk.cxx | 113
sw/source/core/uibase/index/toxmgr.cxx | 502 -
sw/source/core/uibase/lingu/hhcwrp.cxx | 720 -
sw/source/core/uibase/lingu/hyp.cxx | 129
sw/source/core/uibase/lingu/olmenu.cxx | 887 --
sw/source/core/uibase/lingu/olmenu.hrc | 86
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 | 671 -
sw/source/core/uibase/misc/glshell.cxx | 276
sw/source/core/uibase/misc/numberingtypelistbox.cxx | 164
sw/source/core/uibase/misc/redlndlg.cxx | 1206 --
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 | 188
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 | 61
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 | 73
sw/source/core/uibase/ribbar/workctrl.src | 382
sw/source/core/uibase/shells/annotsh.cxx | 1767 ----
sw/source/core/uibase/shells/basesh.cxx | 2905 ------
sw/source/core/uibase/shells/beziersh.cxx | 333
sw/source/core/uibase/shells/drawdlg.cxx | 234
sw/source/core/uibase/shells/drawsh.cxx | 600 -
sw/source/core/uibase/shells/drformsh.cxx | 261
sw/source/core/uibase/shells/drwbassh.cxx | 951 --
sw/source/core/uibase/shells/drwtxtex.cxx | 1084 --
sw/source/core/uibase/shells/drwtxtsh.cxx | 882 --
sw/source/core/uibase/shells/frmsh.cxx | 1362 ---
sw/source/core/uibase/shells/grfsh.cxx | 918 --
sw/source/core/uibase/shells/grfshex.cxx | 154
sw/source/core/uibase/shells/langhelper.cxx | 611 -
sw/source/core/uibase/shells/listsh.cxx | 282
sw/source/core/uibase/shells/mediash.cxx | 202
sw/source/core/uibase/shells/navsh.cxx | 108
sw/source/core/uibase/shells/olesh.cxx | 58
sw/source/core/uibase/shells/slotadd.cxx | 139
sw/source/core/uibase/shells/tabsh.cxx | 1479 ---
sw/source/core/uibase/shells/textdrw.cxx | 126
sw/source/core/uibase/shells/textfld.cxx | 935 --
sw/source/core/uibase/shells/textglos.cxx | 129
sw/source/core/uibase/shells/textidx.cxx | 251
sw/source/core/uibase/shells/textsh.cxx | 1139 --
sw/source/core/uibase/shells/textsh1.cxx | 1822 ----
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 | 303
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 | 161
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 | 168
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 | 601 -
sw/source/core/uibase/uiview/pview.cxx | 1914 ----
sw/source/core/uibase/uiview/scroll.cxx | 121
sw/source/core/uibase/uiview/srcview.cxx | 877 -
sw/source/core/uibase/uiview/swcli.cxx | 172
sw/source/core/uibase/uiview/uivwimp.cxx | 313
sw/source/core/uibase/uiview/view.cxx | 1818 ----
sw/source/core/uibase/uiview/view.hrc | 74
sw/source/core/uibase/uiview/view.src | 149
sw/source/core/uibase/uiview/view0.cxx | 601 -
sw/source/core/uibase/uiview/view1.cxx | 183
sw/source/core/uibase/uiview/view2.cxx | 2495 -----
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 | 758 -
sw/source/core/uibase/uiview/viewfunc.hxx | 53
sw/source/core/uibase/uiview/viewling.cxx | 898 --
sw/source/core/uibase/uiview/viewmdi.cxx | 610 -
sw/source/core/uibase/uiview/viewport.cxx | 1276 --
sw/source/core/uibase/uiview/viewprt.cxx | 306
sw/source/core/uibase/uiview/viewsrch.cxx | 838 -
sw/source/core/uibase/uiview/viewstat.cxx | 561 -
sw/source/core/uibase/uiview/viewtab.cxx | 2008 ----
sw/source/core/uibase/uno/SwXDocumentSettings.cxx | 1254 --
sw/source/core/uibase/uno/SwXDocumentSettings.hxx | 97
sw/source/core/uibase/uno/SwXFilterOptions.cxx | 179
sw/source/core/uibase/uno/dlelstnr.cxx | 165
sw/source/core/uibase/uno/unoatxt.cxx | 1122 --
sw/source/core/uibase/uno/unodefaults.cxx | 51
sw/source/core/uibase/uno/unodefaults.hxx | 40
sw/source/core/uibase/uno/unodispatch.cxx | 400
sw/source/core/uibase/uno/unodoc.cxx | 114
sw/source/core/uibase/uno/unofreg.cxx | 287
sw/source/core/uibase/uno/unomailmerge.cxx | 1221 --
sw/source/core/uibase/uno/unomod.cxx | 1000 --
sw/source/core/uibase/uno/unomodule.cxx | 156
sw/source/core/uibase/uno/unomodule.hxx | 81
sw/source/core/uibase/uno/unotxdoc.cxx | 3992 ---------
sw/source/core/uibase/uno/unotxvw.cxx | 1846 ----
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 | 3524 --------
sw/source/core/uibase/utlui/glbltree.cxx | 1376 ---
sw/source/core/uibase/utlui/gloslst.cxx | 418
sw/source/core/uibase/utlui/initui.cxx | 342
sw/source/core/uibase/utlui/initui.hrc | 58
sw/source/core/uibase/utlui/initui.src | 418
sw/source/core/uibase/utlui/navicfg.cxx | 119
sw/source/core/uibase/utlui/navipi.cxx | 1385 ---
sw/source/core/uibase/utlui/navipi.hrc | 71
sw/source/core/uibase/utlui/navipi.src | 484 -
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 | 815 -
sw/source/core/uibase/utlui/unotools.cxx | 565 -
sw/source/core/uibase/utlui/unotools.hrc | 28
sw/source/core/uibase/utlui/unotools.src | 42
sw/source/core/uibase/utlui/viewlayoutctrl.cxx | 194
sw/source/core/uibase/utlui/wordcountctrl.cxx | 27
sw/source/core/uibase/utlui/zoomctrl.cxx | 72
sw/source/core/uibase/web/wdocsh.cxx | 87
sw/source/core/uibase/web/wformsh.cxx | 59
sw/source/core/uibase/web/wfrmsh.cxx | 59
sw/source/core/uibase/web/wgrfsh.cxx | 64
sw/source/core/uibase/web/wlistsh.cxx | 57
sw/source/core/uibase/web/wolesh.cxx | 59
sw/source/core/uibase/web/wtabsh.cxx | 64
sw/source/core/uibase/web/wtextsh.cxx | 68
sw/source/core/uibase/web/wview.cxx | 294
sw/source/core/uibase/wrtsh/delete.cxx | 533 -
sw/source/core/uibase/wrtsh/move.cxx | 689 -
sw/source/core/uibase/wrtsh/navmgr.cxx | 228
sw/source/core/uibase/wrtsh/select.cxx | 966 --
sw/source/core/uibase/wrtsh/wrtsh.hrc | 39
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/filter/ww8/styles.cxx | 2
sw/source/filter/ww8/wrtw8sty.cxx | 2
sw/source/filter/ww8/ww8par.hxx | 2
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/ui/dbui/mmoutputpage.hxx | 3
sw/source/ui/dbui/mmoutputtypepage.cxx | 569 +
sw/source/ui/dialog/swdlgfact.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 2
sw/source/ui/envelp/label1.cxx | 4
sw/source/ui/envelp/labfmt.cxx | 4
sw/source/ui/envelp/swuilabimp.hxx | 3
sw/source/ui/table/tabledlg.cxx | 2
sw/source/ui/utlui/swrenamexnameddlg.cxx | 2
sw/source/uibase/app/appenv.cxx | 508 +
sw/source/uibase/app/apphdl.cxx | 898 ++
sw/source/uibase/app/applab.cxx | 413
sw/source/uibase/app/appopt.cxx | 528 +
sw/source/uibase/app/docsh.cxx | 1328 +++
sw/source/uibase/app/docsh2.cxx | 1584 +++
sw/source/uibase/app/docshdrw.cxx | 55
sw/source/uibase/app/docshini.cxx | 683 +
sw/source/uibase/app/docst.cxx | 1279 ++
sw/source/uibase/app/docstyle.cxx | 2980 ++++++
sw/source/uibase/app/mainwn.cxx | 141
sw/source/uibase/app/swdll.cxx | 164
sw/source/uibase/app/swdllimpl.hxx | 36
sw/source/uibase/app/swmodul1.cxx | 659 +
sw/source/uibase/app/swmodule.cxx | 421
sw/source/uibase/app/swwait.cxx | 84
sw/source/uibase/cctrl/actctrl.cxx | 125
sw/source/uibase/cctrl/popbox.cxx | 63
sw/source/uibase/cctrl/swlbox.cxx | 137
sw/source/uibase/chrdlg/ccoll.cxx | 182
sw/source/uibase/config/barcfg.cxx | 127
sw/source/uibase/config/caption.cxx | 76
sw/source/uibase/config/cfgitems.cxx | 348
sw/source/uibase/config/dbconfig.cxx | 116
sw/source/uibase/config/fontcfg.cxx | 320
sw/source/uibase/config/modcfg.cxx | 1398 +++
sw/source/uibase/config/prtopt.cxx | 172
sw/source/uibase/config/uinums.cxx | 562 +
sw/source/uibase/config/usrpref.cxx | 592 +
sw/source/uibase/config/viewopt.cxx | 550 +
sw/source/uibase/dbui/dbmgr.cxx | 2943 ++++++
sw/source/uibase/dbui/dbtree.cxx | 522 +
sw/source/uibase/dbui/dbui.cxx | 87
sw/source/uibase/dbui/maildispatcher.cxx | 275
sw/source/uibase/dbui/mailmergechildwindow.cxx | 104
sw/source/uibase/dbui/mailmergechildwindow.hrc | 47
sw/source/uibase/dbui/mailmergechildwindow.src | 208
sw/source/uibase/dbui/mailmergehelper.cxx | 894 ++
sw/source/uibase/dbui/mmconfigitem.cxx | 1741 +++
sw/source/uibase/dbui/swdbtoolsclient.cxx | 232
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 844 +
sw/source/uibase/dialog/regionsw.cxx | 239
sw/source/uibase/dialog/regionsw.hrc | 42
sw/source/uibase/dialog/regionsw.src | 69
sw/source/uibase/dialog/swabstdlg.cxx | 59
sw/source/uibase/dialog/swwrtshitem.cxx | 43
sw/source/uibase/dialog/wordcountwrapper.cxx | 49
sw/source/uibase/dochdl/gloshdl.cxx | 751 +
sw/source/uibase/dochdl/swdtflvr.cxx | 3798 ++++++++
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 449 +
sw/source/uibase/docvw/AnchorOverlayObject.hxx | 133
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 205
sw/source/uibase/docvw/AnnotationMenuButton.hxx | 53
sw/source/uibase/docvw/AnnotationWin.cxx | 318
sw/source/uibase/docvw/DashedLine.cxx | 97
sw/source/uibase/docvw/FrameControlsManager.cxx | 159
sw/source/uibase/docvw/HeaderFooterWin.cxx | 520 +
sw/source/uibase/docvw/OverlayRanges.cxx | 180
sw/source/uibase/docvw/OverlayRanges.hxx | 78
sw/source/uibase/docvw/PageBreakWin.cxx | 463 +
sw/source/uibase/docvw/PostItMgr.cxx | 2029 ++++
sw/source/uibase/docvw/ShadowOverlayObject.cxx | 252
sw/source/uibase/docvw/ShadowOverlayObject.hxx | 70
sw/source/uibase/docvw/SidebarTxtControl.cxx | 433
sw/source/uibase/docvw/SidebarTxtControl.hxx | 77
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 293
sw/source/uibase/docvw/SidebarTxtControlAcc.hxx | 46
sw/source/uibase/docvw/SidebarWin.cxx | 1420 +++
sw/source/uibase/docvw/SidebarWinAcc.cxx | 143
sw/source/uibase/docvw/SidebarWinAcc.hxx | 57
sw/source/uibase/docvw/annotation.hrc | 44
sw/source/uibase/docvw/docvw.hrc | 89
sw/source/uibase/docvw/docvw.src | 307
sw/source/uibase/docvw/edtdd.cxx | 495 +
sw/source/uibase/docvw/edtwin.cxx | 6147 ++++++++++++++
sw/source/uibase/docvw/edtwin2.cxx | 465 +
sw/source/uibase/docvw/edtwin3.cxx | 166
sw/source/uibase/docvw/frmsidebarwincontainer.cxx | 204
sw/source/uibase/docvw/frmsidebarwincontainer.hxx | 63
sw/source/uibase/docvw/romenu.cxx | 368
sw/source/uibase/docvw/romenu.hxx | 64
sw/source/uibase/docvw/srcedtw.cxx | 993 ++
sw/source/uibase/envelp/envimg.cxx | 355
sw/source/uibase/envelp/label.hrc | 42
sw/source/uibase/envelp/labelcfg.cxx | 358
sw/source/uibase/envelp/labimg.cxx | 473 +
sw/source/uibase/envelp/labimp.hxx | 114
sw/source/uibase/envelp/syncbtn.cxx | 82
sw/source/uibase/fldui/fldmgr.cxx | 1715 +++
sw/source/uibase/fldui/fldwrap.cxx | 155
sw/source/uibase/fldui/xfldui.cxx | 165
sw/source/uibase/frmdlg/colex.cxx | 586 +
sw/source/uibase/frmdlg/colmgr.cxx | 139
sw/source/uibase/frmdlg/frmmgr.cxx | 589 +
sw/source/uibase/globdoc/globdoc.cxx | 73
sw/source/uibase/inc/DashedLine.hxx | 30
sw/source/uibase/inc/DropDownFieldDialog.hxx | 56
sw/source/uibase/inc/FrameControl.hxx | 53
sw/source/uibase/inc/FrameControlsManager.hxx | 56
sw/source/uibase/inc/HeaderFooterWin.hxx | 58
sw/source/uibase/inc/PageBreakWin.hxx | 63
sw/source/uibase/inc/SidebarWindowsConsts.hxx | 31
sw/source/uibase/inc/SwSpellDialogChildWindow.hxx | 67
sw/source/uibase/inc/SwXFilterOptions.hxx | 101
sw/source/uibase/inc/abstract.hxx | 42
sw/source/uibase/inc/actctrl.hxx | 84
sw/source/uibase/inc/addrdlg.hxx | 32
sw/source/uibase/inc/annotsh.hxx | 81
sw/source/uibase/inc/app.hrc | 116
sw/source/uibase/inc/ascfldlg.hxx | 62
sw/source/uibase/inc/autoedit.hxx | 37
sw/source/uibase/inc/barcfg.hxx | 41
sw/source/uibase/inc/basesh.hxx | 120
sw/source/uibase/inc/beziersh.hxx | 43
sw/source/uibase/inc/bmpwin.hxx | 54
sw/source/uibase/inc/bookctrl.hxx | 45
sw/source/uibase/inc/bookmark.hxx | 70
sw/source/uibase/inc/break.hxx | 75
sw/source/uibase/inc/caption.hxx | 98
sw/source/uibase/inc/cfgid.h | 28
sw/source/uibase/inc/cfgitems.hxx | 216
sw/source/uibase/inc/changedb.hxx | 66
sw/source/uibase/inc/chartins.hxx | 27
sw/source/uibase/inc/chldwrap.hxx | 47
sw/source/uibase/inc/chrdlg.hxx | 94
sw/source/uibase/inc/chrdlgmodes.hxx | 21
sw/source/uibase/inc/cnttab.hxx | 84
sw/source/uibase/inc/colex.hxx | 109
sw/source/uibase/inc/colmgr.hxx | 126
sw/source/uibase/inc/column.hxx | 204
sw/source/uibase/inc/conarc.hxx | 43
sw/source/uibase/inc/concustomshape.hxx | 58
sw/source/uibase/inc/condedit.hxx | 49
sw/source/uibase/inc/conform.hxx | 38
sw/source/uibase/inc/conpoly.hxx | 42
sw/source/uibase/inc/conrect.hxx | 46
sw/source/uibase/inc/content.hxx | 208
sw/source/uibase/inc/conttree.hxx | 329
sw/source/uibase/inc/convert.hxx | 74
sw/source/uibase/inc/cption.hxx | 113
sw/source/uibase/inc/dbconfig.hxx | 47
sw/source/uibase/inc/dbinsdlg.hxx | 171
sw/source/uibase/inc/dbtree.hxx | 72
sw/source/uibase/inc/dbui.hxx | 70
sw/source/uibase/inc/dialmgr.hxx | 31
sw/source/uibase/inc/docfnote.hxx | 44
sw/source/uibase/inc/docstdlg.hxx | 68
sw/source/uibase/inc/drawbase.hxx | 74
sw/source/uibase/inc/drawsh.hxx | 55
sw/source/uibase/inc/drformsh.hxx | 46
sw/source/uibase/inc/drpcps.hxx | 99
sw/source/uibase/inc/drwbassh.hxx | 62
sw/source/uibase/inc/drwtxtsh.hxx | 86
sw/source/uibase/inc/dselect.hxx | 38
sw/source/uibase/inc/edtwin.hxx | 295
sw/source/uibase/inc/envimg.hxx | 87
sw/source/uibase/inc/envlop.hxx | 119
sw/source/uibase/inc/fldedt.hxx | 55
sw/source/uibase/inc/fldmgr.hxx | 213
sw/source/uibase/inc/fldtdlg.hxx | 66
sw/source/uibase/inc/fldwrap.hxx | 53
sw/source/uibase/inc/fontcfg.hxx | 112
sw/source/uibase/inc/formatclipboard.hxx | 92
sw/source/uibase/inc/formedt.hxx | 90
sw/source/uibase/inc/frmdlg.hxx | 68
sw/source/uibase/inc/frmmgr.hxx | 188
sw/source/uibase/inc/frmpage.hxx | 326
sw/source/uibase/inc/frmsh.hxx | 56
sw/source/uibase/inc/frmui.hrc | 69
sw/source/uibase/inc/globals.h | 31
sw/source/uibase/inc/globdoc.hrc | 40
sw/source/uibase/inc/glosbib.hxx | 116
sw/source/uibase/inc/glosdoc.hxx | 134
sw/source/uibase/inc/gloshdl.hxx | 103
sw/source/uibase/inc/gloslst.hxx | 82
sw/source/uibase/inc/glossary.hxx | 167
sw/source/uibase/inc/glshell.hxx | 93
sw/source/uibase/inc/grfsh.hxx | 46
sw/source/uibase/inc/hyp.hxx | 58
sw/source/uibase/inc/idxmrk.hxx | 60
sw/source/uibase/inc/imaildsplistener.hxx | 70
sw/source/uibase/inc/initui.hxx | 66
sw/source/uibase/inc/inpdlg.hxx | 60
sw/source/uibase/inc/inputwin.hxx | 119
sw/source/uibase/inc/insfnote.hxx | 85
sw/source/uibase/inc/instable.hxx | 76
sw/source/uibase/inc/javaedit.hxx | 86
sw/source/uibase/inc/label.hxx | 93
sw/source/uibase/inc/labelcfg.hxx | 61
sw/source/uibase/inc/labimg.hxx | 123
sw/source/uibase/inc/langhelper.hxx | 62
sw/source/uibase/inc/linenum.hxx | 64
sw/source/uibase/inc/listsh.hxx | 43
sw/source/uibase/inc/macassgn.hxx | 47
sw/source/uibase/inc/mailconfigpage.hxx | 77
sw/source/uibase/inc/maildispatcher.hxx | 158
sw/source/uibase/inc/mailmergechildwindow.hxx | 52
sw/source/uibase/inc/mailmergehelper.hxx | 299
sw/source/uibase/inc/mailmergewizard.hxx | 97
sw/source/uibase/inc/mailmrge.hxx | 173
sw/source/uibase/inc/mediash.hxx | 42
sw/source/uibase/inc/mergetbl.hxx | 41
sw/source/uibase/inc/misc.hrc | 60
sw/source/uibase/inc/mmconfigitem.hxx | 270
sw/source/uibase/inc/multmrk.hxx | 49
sw/source/uibase/inc/navicfg.hxx | 109
sw/source/uibase/inc/navicont.hxx | 54
sw/source/uibase/inc/navipi.hxx | 181
sw/source/uibase/inc/navmgr.hxx | 56
sw/source/uibase/inc/navsh.hxx | 34
sw/source/uibase/inc/num.hxx | 166
sw/source/uibase/inc/numberingtypelistbox.hxx | 51
sw/source/uibase/inc/numfmtlb.hxx | 73
sw/source/uibase/inc/numpara.hxx | 82
sw/source/uibase/inc/numprevw.hxx | 71
sw/source/uibase/inc/olesh.hxx | 39
sw/source/uibase/inc/olmenu.hxx | 91
sw/source/uibase/inc/optcomp.hxx | 74
sw/source/uibase/inc/optload.hxx | 178
sw/source/uibase/inc/optpage.hxx | 428
sw/source/uibase/inc/outline.hxx | 138
sw/source/uibase/inc/pardlg.hxx | 30
sw/source/uibase/inc/pattern.hxx | 36
sw/source/uibase/inc/pgfnote.hxx | 75
sw/source/uibase/inc/pggrid.hxx | 99
sw/source/uibase/inc/popbox.hxx | 57
sw/source/uibase/inc/popup.hrc | 48
sw/source/uibase/inc/prcntfld.hxx | 111
sw/source/uibase/inc/pview.hxx | 305
sw/source/uibase/inc/redline_tmpl.hrc | 39
sw/source/uibase/inc/redlndlg.hxx | 162
sw/source/uibase/inc/regionsw.hxx | 299
sw/source/uibase/inc/ribbar.hrc | 95
sw/source/uibase/inc/rowht.hxx | 44
sw/source/uibase/inc/scroll.hxx | 59
sw/source/uibase/inc/selglos.hxx | 54
sw/source/uibase/inc/sharedconnection.hxx | 30
sw/source/uibase/inc/shdwcrsr.hxx | 57
sw/source/uibase/inc/shells.hrc | 98
sw/source/uibase/inc/splittbl.hxx | 49
sw/source/uibase/inc/srcedtw.hxx | 157
sw/source/uibase/inc/srcview.hxx | 93
sw/source/uibase/inc/srtdlg.hxx | 92
sw/source/uibase/inc/stmenu.hxx | 72
sw/source/uibase/inc/swcont.hxx | 99
sw/source/uibase/inc/swdtflvr.hxx | 213
sw/source/uibase/inc/swlbox.hxx | 80
sw/source/uibase/inc/swmessdialog.hxx | 30
sw/source/uibase/inc/swmodalredlineacceptdlg.hxx | 40
sw/source/uibase/inc/swrenamexnameddlg.hxx | 69
sw/source/uibase/inc/swruler.hxx | 122
sw/source/uibase/inc/swtablerep.hxx | 84
sw/source/uibase/inc/swuiccoll.hxx | 75
sw/source/uibase/inc/swuicnttab.hxx | 497 +
sw/source/uibase/inc/swuiidxmrk.hxx | 252
sw/source/uibase/inc/swuipardlg.hxx | 53
sw/source/uibase/inc/swvset.hxx | 32
sw/source/uibase/inc/swwrtshitem.hxx | 45
sw/source/uibase/inc/syncbtn.hxx | 53
sw/source/uibase/inc/table.hrc | 34
sw/source/uibase/inc/tabledlg.hxx | 47
sw/source/uibase/inc/tablemgr.hxx | 88
sw/source/uibase/inc/tabsh.hxx | 57
sw/source/uibase/inc/tautofmt.hxx | 91
sw/source/uibase/inc/tblctrl.hxx | 40
sw/source/uibase/inc/tblnumfm.hxx | 35
sw/source/uibase/inc/tbxanchr.hxx | 42
sw/source/uibase/inc/textsh.hxx | 88
sw/source/uibase/inc/titlepage.hxx | 70
sw/source/uibase/inc/tmpdlg.hxx | 89
sw/source/uibase/inc/tmplctrl.hxx | 44
sw/source/uibase/inc/toxmgr.hxx | 306
sw/source/uibase/inc/uiborder.hxx | 41
sw/source/uibase/inc/uiitems.hxx | 117
sw/source/uibase/inc/uinums.hxx | 122
sw/source/uibase/inc/uitool.hxx | 109
sw/source/uibase/inc/uivwimp.hxx | 179
sw/source/uibase/inc/unoatxt.hxx | 283
sw/source/uibase/inc/unodispatch.hxx | 128
sw/source/uibase/inc/unomailmerge.hxx | 179
sw/source/uibase/inc/unomod.hxx | 179
sw/source/uibase/inc/unotools.hxx | 121
sw/source/uibase/inc/unotxvw.hxx | 338
sw/source/uibase/inc/usrpref.hxx | 276
sw/source/uibase/inc/utlui.hrc | 183
sw/source/uibase/inc/view.hxx | 686 +
sw/source/uibase/inc/viewlayoutctrl.hxx | 45
sw/source/uibase/inc/web.hrc | 45
sw/source/uibase/inc/wformsh.hxx | 42
sw/source/uibase/inc/wfrmsh.hxx | 42
sw/source/uibase/inc/wgrfsh.hxx | 40
sw/source/uibase/inc/wlistsh.hxx | 42
sw/source/uibase/inc/wolesh.hxx | 40
sw/source/uibase/inc/wordcountctrl.hxx | 33
sw/source/uibase/inc/wordcountdialog.hxx | 83
sw/source/uibase/inc/workctrl.hxx | 185
sw/source/uibase/inc/wrap.hxx | 114
sw/source/uibase/inc/wrtsh.hxx | 644 +
sw/source/uibase/inc/wtabsh.hxx | 41
sw/source/uibase/inc/wtextsh.hxx | 42
sw/source/uibase/inc/wview.hxx | 46
sw/source/uibase/inc/zoomctrl.hxx | 43
sw/source/uibase/index/idxmrk.cxx | 113
sw/source/uibase/index/toxmgr.cxx | 502 +
sw/source/uibase/lingu/hhcwrp.cxx | 720 +
sw/source/uibase/lingu/hyp.cxx | 129
sw/source/uibase/lingu/olmenu.cxx | 887 ++
sw/source/uibase/lingu/olmenu.hrc | 86
sw/source/uibase/lingu/olmenu.src | 131
sw/source/uibase/lingu/sdrhhcwrap.cxx | 175
sw/source/uibase/lingu/sdrhhcwrap.hxx | 56
sw/source/uibase/misc/glosdoc.cxx | 671 +
sw/source/uibase/misc/glshell.cxx | 276
sw/source/uibase/misc/numberingtypelistbox.cxx | 164
sw/source/uibase/misc/redlndlg.cxx | 1206 ++
sw/source/uibase/misc/redlndlg.hrc | 28
sw/source/uibase/misc/redlndlg.src | 85
sw/source/uibase/misc/swruler.cxx | 302
sw/source/uibase/ribbar/conarc.cxx | 102
sw/source/uibase/ribbar/concustomshape.cxx | 196
sw/source/uibase/ribbar/conform.cxx | 110
sw/source/uibase/ribbar/conpoly.cxx | 107
sw/source/uibase/ribbar/conrect.cxx | 188
sw/source/uibase/ribbar/drawbase.cxx | 623 +
sw/source/uibase/ribbar/dselect.cxx | 72
sw/source/uibase/ribbar/inputwin.cxx | 636 +
sw/source/uibase/ribbar/inputwin.hrc | 61
sw/source/uibase/ribbar/inputwin.src | 290
sw/source/uibase/ribbar/tblctrl.cxx | 55
sw/source/uibase/ribbar/tbxanchr.cxx | 124
sw/source/uibase/ribbar/workctrl.cxx | 775 +
sw/source/uibase/ribbar/workctrl.hrc | 73
sw/source/uibase/ribbar/workctrl.src | 382
sw/source/uibase/shells/annotsh.cxx | 1767 ++++
sw/source/uibase/shells/basesh.cxx | 2905 ++++++
sw/source/uibase/shells/beziersh.cxx | 333
sw/source/uibase/shells/drawdlg.cxx | 234
sw/source/uibase/shells/drawsh.cxx | 600 +
sw/source/uibase/shells/drformsh.cxx | 261
sw/source/uibase/shells/drwbassh.cxx | 951 ++
sw/source/uibase/shells/drwtxtex.cxx | 1084 ++
sw/source/uibase/shells/drwtxtsh.cxx | 882 ++
sw/source/uibase/shells/frmsh.cxx | 1362 +++
sw/source/uibase/shells/grfsh.cxx | 918 ++
sw/source/uibase/shells/grfshex.cxx | 154
sw/source/uibase/shells/langhelper.cxx | 611 +
sw/source/uibase/shells/listsh.cxx | 282
sw/source/uibase/shells/mediash.cxx | 202
sw/source/uibase/shells/navsh.cxx | 108
sw/source/uibase/shells/olesh.cxx | 58
sw/source/uibase/shells/slotadd.cxx | 139
sw/source/uibase/shells/tabsh.cxx | 1479 +++
sw/source/uibase/shells/textdrw.cxx | 126
sw/source/uibase/shells/textfld.cxx | 935 ++
sw/source/uibase/shells/textglos.cxx | 129
sw/source/uibase/shells/textidx.cxx | 251
sw/source/uibase/shells/textsh.cxx | 1139 ++
sw/source/uibase/shells/textsh1.cxx | 1822 ++++
sw/source/uibase/shells/textsh2.cxx | 285
sw/source/uibase/shells/txtattr.cxx | 743 +
sw/source/uibase/shells/txtcrsr.cxx | 376
sw/source/uibase/shells/txtnum.cxx | 303
sw/source/uibase/sidebar/PageColumnControl.cxx | 110
sw/source/uibase/sidebar/PageColumnControl.hxx | 65
sw/source/uibase/sidebar/PageMarginControl.cxx | 518 +
sw/source/uibase/sidebar/PageMarginControl.hxx | 121
sw/source/uibase/sidebar/PageOrientationControl.cxx | 90
sw/source/uibase/sidebar/PageOrientationControl.hxx | 56
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 742 +
sw/source/uibase/sidebar/PagePropertyPanel.hrc | 161
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 223
sw/source/uibase/sidebar/PageSizeControl.cxx | 177
sw/source/uibase/sidebar/PageSizeControl.hxx | 71
sw/source/uibase/sidebar/PropertyPanel.hrc | 35
sw/source/uibase/sidebar/SwPanelFactory.cxx | 148
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 243
sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 88
sw/source/uibase/smartmenu/stmenu.cxx | 168
sw/source/uibase/smartmenu/stmenu.hrc | 33
sw/source/uibase/smartmenu/stmenu.src | 37
sw/source/uibase/table/chartins.cxx | 254
sw/source/uibase/table/swtablerep.cxx | 186
sw/source/uibase/table/tablemgr.cxx | 349
sw/source/uibase/table/tablepg.hxx | 195
sw/source/uibase/uiview/formatclipboard.cxx | 601 +
sw/source/uibase/uiview/pview.cxx | 1914 ++++
sw/source/uibase/uiview/scroll.cxx | 121
sw/source/uibase/uiview/srcview.cxx | 877 +
sw/source/uibase/uiview/swcli.cxx | 172
sw/source/uibase/uiview/uivwimp.cxx | 313
sw/source/uibase/uiview/view.cxx | 1818 ++++
sw/source/uibase/uiview/view.hrc | 74
sw/source/uibase/uiview/view.src | 149
sw/source/uibase/uiview/view0.cxx | 601 +
sw/source/uibase/uiview/view1.cxx | 183
sw/source/uibase/uiview/view2.cxx | 2495 +++++
sw/source/uibase/uiview/viewcoll.cxx | 80
sw/source/uibase/uiview/viewdlg.cxx | 75
sw/source/uibase/uiview/viewdlg2.cxx | 202
sw/source/uibase/uiview/viewdraw.cxx | 758 +
sw/source/uibase/uiview/viewfunc.hxx | 53
sw/source/uibase/uiview/viewling.cxx | 898 ++
sw/source/uibase/uiview/viewmdi.cxx | 610 +
sw/source/uibase/uiview/viewport.cxx | 1276 ++
sw/source/uibase/uiview/viewprt.cxx | 306
sw/source/uibase/uiview/viewsrch.cxx | 838 +
sw/source/uibase/uiview/viewstat.cxx | 561 +
sw/source/uibase/uiview/viewtab.cxx | 2008 ++++
sw/source/uibase/uno/SwXDocumentSettings.cxx | 1254 ++
sw/source/uibase/uno/SwXDocumentSettings.hxx | 97
sw/source/uibase/uno/SwXFilterOptions.cxx | 179
sw/source/uibase/uno/dlelstnr.cxx | 165
sw/source/uibase/uno/unoatxt.cxx | 1122 ++
sw/source/uibase/uno/unodefaults.cxx | 51
sw/source/uibase/uno/unodefaults.hxx | 40
sw/source/uibase/uno/unodispatch.cxx | 400
sw/source/uibase/uno/unodoc.cxx | 114
sw/source/uibase/uno/unofreg.cxx | 287
sw/source/uibase/uno/unomailmerge.cxx | 1221 ++
sw/source/uibase/uno/unomod.cxx | 1000 ++
sw/source/uibase/uno/unomodule.cxx | 156
sw/source/uibase/uno/unomodule.hxx | 81
sw/source/uibase/uno/unotxdoc.cxx | 3992 +++++++++
sw/source/uibase/uno/unotxvw.cxx | 1846 ++++
sw/source/uibase/utlui/attrdesc.cxx | 1248 ++
sw/source/uibase/utlui/attrdesc.hrc | 115
sw/source/uibase/utlui/attrdesc.src | 363
sw/source/uibase/utlui/bookctrl.cxx | 128
sw/source/uibase/utlui/condedit.cxx | 90
sw/source/uibase/utlui/content.cxx | 3524 ++++++++
sw/source/uibase/utlui/glbltree.cxx | 1376 +++
sw/source/uibase/utlui/gloslst.cxx | 418
sw/source/uibase/utlui/initui.cxx | 342
sw/source/uibase/utlui/initui.hrc | 58
sw/source/uibase/utlui/initui.src | 418
sw/source/uibase/utlui/navicfg.cxx | 119
sw/source/uibase/utlui/navipi.cxx | 1385 +++
sw/source/uibase/utlui/navipi.hrc | 71
sw/source/uibase/utlui/navipi.src | 484 +
sw/source/uibase/utlui/numfmtlb.cxx | 488 +
sw/source/uibase/utlui/prcntfld.cxx | 287
sw/source/uibase/utlui/shdwcrsr.cxx | 120
sw/source/uibase/utlui/tmplctrl.cxx | 137
sw/source/uibase/utlui/uiitems.cxx | 317
sw/source/uibase/utlui/uitool.cxx | 815 +
sw/source/uibase/utlui/unotools.cxx | 565 +
sw/source/uibase/utlui/unotools.hrc | 28
sw/source/uibase/utlui/unotools.src | 42
sw/source/uibase/utlui/viewlayoutctrl.cxx | 194
sw/source/uibase/utlui/wordcountctrl.cxx | 27
sw/source/uibase/utlui/zoomctrl.cxx | 72
sw/source/uibase/web/wdocsh.cxx | 87
sw/source/uibase/web/wformsh.cxx | 59
sw/source/uibase/web/wfrmsh.cxx | 59
sw/source/uibase/web/wgrfsh.cxx | 64
sw/source/uibase/web/wlistsh.cxx | 57
sw/source/uibase/web/wolesh.cxx | 59
sw/source/uibase/web/wtabsh.cxx | 64
sw/source/uibase/web/wtextsh.cxx | 68
sw/source/uibase/web/wview.cxx | 294
sw/source/uibase/wrtsh/delete.cxx | 533 +
sw/source/uibase/wrtsh/move.cxx | 689 +
sw/source/uibase/wrtsh/navmgr.cxx | 228
sw/source/uibase/wrtsh/select.cxx | 966 ++
sw/source/uibase/wrtsh/wrtsh.hrc | 39
sw/source/uibase/wrtsh/wrtsh.src | 46
sw/source/uibase/wrtsh/wrtsh1.cxx | 1801 ++++
sw/source/uibase/wrtsh/wrtsh2.cxx | 542 +
sw/source/uibase/wrtsh/wrtsh3.cxx | 227
sw/source/uibase/wrtsh/wrtsh4.cxx | 238
sw/source/uibase/wrtsh/wrtundo.cxx | 154
971 files changed, 155293 insertions(+), 155270 deletions(-)
New commits:
commit 732eee2de4d0579eda69fe0ebfa361180fa35456
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue May 27 11:00:14 2014 +0200
fdo#79236: sw: Undo of changing style crashes on invalid item (-1)
Change-Id: Ie0b0791722a0ca8d75b7981362661be0c9706c6d
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 4755251..f610cce 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -450,6 +450,8 @@ void SwDoc::CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet)
for(const SfxPoolItem* pItem = aIter.FirstItem(); pItem; pItem = aIter.NextItem())
{
+ if (IsInvalidItem(pItem))
+ continue;
const SfxPoolItem* pResult = pItem;
switch(pItem->Which())
commit 31a5e28050d5e0105df51c80b12a6c7188084996
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon May 26 23:33:40 2014 +0200
sw: clean up some relative includes
Change-Id: Ide7f2d098e65d03f84af8db4c6bcaaa7c9d58cf2
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index 5ad0ee0..a0a1f19 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "../inc/wwstyles.hxx"
+#include <wwstyles.hxx>
#include <functional>
#include <algorithm>
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 9b8033f..588934b 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -65,7 +65,7 @@
#include "writerhelper.hxx"
#include "writerwordglue.hxx"
-#include "../inc/wwstyles.hxx"
+#include <wwstyles.hxx>
#include "ww8par.hxx"
#include "ww8attributeoutput.hxx"
#include "docxattributeoutput.hxx"
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 8754970..4ffb00b 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -40,7 +40,7 @@
#include "ww8scan.hxx"
#include "ww8glsy.hxx"
#include "wrtww8.hxx"
-#include "../inc/msfilter.hxx"
+#include <msfilter.hxx>
#include <xmloff/odffields.hxx>
#include <IMark.hxx>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 324b85c..2a7cc2c 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -63,7 +63,7 @@
#include <fmtfollowtextflow.hxx>
#include <numrule.hxx>
#include <sprmids.hxx>
-#include "../inc/wwstyles.hxx"
+#include <wwstyles.hxx>
#include "writerhelper.hxx"
#include "ww8struc.hxx"
#include "ww8par.hxx"
commit b3ab939331a455a46b9745ae6b996e307bea87b7
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon May 26 23:33:18 2014 +0200
sw: remove some unused includes
Change-Id: I98dbfac31e489f48bc4e9f1c047c793518160aa3
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 2ed0084..3854690 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -28,8 +28,6 @@
#include "ndole.hxx"
#include <doc.hxx>
#include <docsh.hxx>
-#include <../../uibase/inc/wrtsh.hxx>
-#include <../../uibase/inc/view.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
commit 26da71b624e7c1b22b2cfa261cd644106c7dbd75
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon May 26 22:01:28 2014 +0200
sw: move SwSendMailDialog etc. to swui library
It doesn't make sense to have a declaration in header in sw/source/ui
and the implementation in sw/source/uibase
Change-Id: I270b2102d1f006836bb6210bd7a6c1c2e4c1e431
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 838e5f0..a18445d 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -30,7 +30,6 @@
#include <sfx2/basedlgs.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
-#include "swdllapi.h"
#include "mailmergehelper.hxx"
class SwMailMergeWizard;
@@ -140,7 +139,7 @@ struct SwMailDescriptor
};
struct SwSendMailDialog_Impl;
class SwMailMergeConfigItem;
-class SW_DLLPUBLIC SwSendMailDialog : public ModelessDialog //SfxModalDialog
+class SwSendMailDialog : public ModelessDialog //SfxModalDialog
{
FixedLine m_aStatusFL;
FixedText m_aStatusFT;
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index aae6621..4571d62 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -58,4 +58,573 @@ IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl)
return 0;
}
+
+#include <rtl/ref.hxx>
+#include <com/sun/star/mail/XSmtpService.hpp>
+#include <comphelper/string.hxx>
+#include <vcl/svapp.hxx>
+
+#include <helpid.h>
+#include <cmdid.h>
+#include <../../uibase/dbui/mailmergechildwindow.hrc>
+#include <swunohelper.hxx>
+#include <mmoutputpage.hxx>
+#include <maildispatcher.hxx>
+#include <imaildsplistener.hxx>
+
+using namespace ::com::sun::star;
+
+struct SwSendMailDialog_Impl
+{
+ friend class SwSendMailDialog;
+ ::osl::Mutex aDescriptorMutex;
+
+ ::std::vector< SwMailDescriptor > aDescriptors;
+ sal_uInt32 nCurrentDescriptor;
+ sal_uInt32 nDocumentCount;
+ ::rtl::Reference< MailDispatcher > xMailDispatcher;
+ ::rtl::Reference< IMailDispatcherListener> xMailListener;
+ uno::Reference< mail::XMailService > xConnectedMailService;
+ uno::Reference< mail::XMailService > xConnectedInMailService;
+ Timer aRemoveTimer;
+
+ SwSendMailDialog_Impl() :
+ nCurrentDescriptor(0),
+ nDocumentCount(0)
+ {
+ aRemoveTimer.SetTimeout(500);
+ }
+
+ ~SwSendMailDialog_Impl()
+ {
+ // Shutdown must be called when the last reference to the
+ // mail dispatcher will be released in order to force a
+ // shutdown of the mail dispatcher thread.
+ // 'join' with the mail dispatcher thread leads to a
+ // deadlock (SolarMutex).
+ if( xMailDispatcher.is() && !xMailDispatcher->isShutdownRequested() )
+ xMailDispatcher->shutdown();
+ }
+ const SwMailDescriptor* GetNextDescriptor();
+};
+
+const SwMailDescriptor* SwSendMailDialog_Impl::GetNextDescriptor()
+{
+ ::osl::MutexGuard aGuard(aDescriptorMutex);
+ if(nCurrentDescriptor < aDescriptors.size())
+ {
+ ++nCurrentDescriptor;
+ return &aDescriptors[nCurrentDescriptor - 1];
+ }
+ return 0;
+}
+
+using namespace ::com::sun::star;
+class SwMailDispatcherListener_Impl : public IMailDispatcherListener
+{
+ SwSendMailDialog* m_pSendMailDialog;
+
+public:
+ SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg);
+ virtual ~SwMailDispatcherListener_Impl();
+
+ virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE;
+ virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE;
+ virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE;
+ virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher,
+ uno::Reference< mail::XMailMessage> xMailMessage) SAL_OVERRIDE;
+ virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher,
+ uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) SAL_OVERRIDE;
+
+ static void DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage );
+};
+
+SwMailDispatcherListener_Impl::SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg) :
+ m_pSendMailDialog(&rParentDlg)
+{
+}
+
+SwMailDispatcherListener_Impl::~SwMailDispatcherListener_Impl()
+{
+}
+
+void SwMailDispatcherListener_Impl::started(::rtl::Reference<MailDispatcher> /*xMailDispatcher*/)
+{
+}
+
+void SwMailDispatcherListener_Impl::stopped(
+ ::rtl::Reference<MailDispatcher> /*xMailDispatcher*/)
+{
+}
+
+void SwMailDispatcherListener_Impl::idle(::rtl::Reference<MailDispatcher> /*xMailDispatcher*/)
+{
+ SolarMutexGuard aGuard;
+ m_pSendMailDialog->AllMailsSent();
+}
+
+void SwMailDispatcherListener_Impl::mailDelivered(
+ ::rtl::Reference<MailDispatcher> /*xMailDispatcher*/,
+ uno::Reference< mail::XMailMessage> xMailMessage)
+{
+ SolarMutexGuard aGuard;
+ m_pSendMailDialog->DocumentSent( xMailMessage, true, 0 );
+ DeleteAttachments( xMailMessage );
+}
+
+void SwMailDispatcherListener_Impl::mailDeliveryError(
+ ::rtl::Reference<MailDispatcher> /*xMailDispatcher*/,
+ uno::Reference< mail::XMailMessage> xMailMessage,
+ const OUString& sErrorMessage)
+{
+ SolarMutexGuard aGuard;
+ m_pSendMailDialog->DocumentSent( xMailMessage, false, &sErrorMessage );
+ DeleteAttachments( xMailMessage );
+}
+
+void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage )
+{
+ uno::Sequence< mail::MailAttachment > aAttachments = xMessage->getAttachments();
+
+ for(sal_Int32 nFile = 0; nFile < aAttachments.getLength(); ++nFile)
+ {
+ try
+ {
+ uno::Reference< beans::XPropertySet > xTransferableProperties( aAttachments[nFile].Data, uno::UNO_QUERY_THROW);
+ if( xTransferableProperties.is() )
+ {
+ OUString sURL;
+ xTransferableProperties->getPropertyValue("URL") >>= sURL;
+ if(!sURL.isEmpty())
+ SWUnoHelper::UCB_DeleteFile( sURL );
+ }
+ }
+ catch (const uno::Exception&)
+ {
+ }
+ }
+}
+
+class SwSendWarningBox_Impl : public MessageDialog
+{
+ VclMultiLineEdit *m_pDetailED;
+public:
+ SwSendWarningBox_Impl(Window* pParent, const OUString& rDetails);
+};
+
+SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const OUString& rDetails)
+ : MessageDialog(pParent, "WarnEmailDialog", "modules/swriter/ui/warnemaildialog.ui")
+{
+ get(m_pDetailED, "errors");
+ m_pDetailED->SetMaxTextWidth(80 * m_pDetailED->approximate_char_width());
+ m_pDetailED->set_width_request(80 * m_pDetailED->approximate_char_width());
+ m_pDetailED->set_height_request(8 * m_pDetailED->GetTextHeight());
+ m_pDetailED->SetText(rDetails);
+}
+
+#define ITEMID_TASK 1
+#define ITEMID_STATUS 2
+
+SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConfigItem) :
+ ModelessDialog /*SfxModalDialog*/(pParent, SW_RES(DLG_MM_SENDMAILS)),
+ m_aStatusFL( this, SW_RES( FL_STATUS )),
+ m_aStatusFT( this, SW_RES( FT_STATUS1 )),
+ m_aTransferStatusFL( this, SW_RES( FL_TRANSFERSTATUS )),
+ m_aTransferStatusFT( this, SW_RES( FT_TRANSFERSTATUS )),
+ m_PausedFI(this, SW_RES( FI_PAUSED )),
+ m_aProgressBar( this, SW_RES( PB_PROGRESS )),
+ m_aErrorStatusFT( this, SW_RES( FT_ERRORSTATUS )),
+ m_aDetailsPB( this, SW_RES( PB_DETAILS )),
+ m_aStatusHB( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
+ m_aStatusLB( this, SW_RES( LB_STATUS )),
+ m_aSeparatorFL( this, SW_RES( FL_SEPARATOR )),
+ m_aStopPB( this, SW_RES( PB_STOP )),
+ m_aClosePB( this, SW_RES( PB_CLOSE )),
+ m_sMore(m_aDetailsPB.GetText()),
+ m_sLess(SW_RES(ST_LESS)),
+ m_sContinue(SW_RES( ST_CONTINUE )),
+ m_sStop(m_aStopPB.GetText()),
+ m_sSend(SW_RES(ST_SEND)),
+ m_sTransferStatus(m_aTransferStatusFT.GetText()),
+ m_sErrorStatus( m_aErrorStatusFT.GetText()),
+ m_sSendingTo( SW_RES(ST_SENDINGTO )),
+ m_sCompleted( SW_RES(ST_COMPLETED )),
+ m_sFailed( SW_RES(ST_FAILED )),
+ m_sTerminateQuery( SW_RES( ST_TERMINATEQUERY )),
+ m_bCancel(false),
+ m_bDesctructionEnabled(false),
+ m_aImageList( SW_RES( ILIST ) ),
+ m_pImpl(new SwSendMailDialog_Impl),
+ m_pConfigItem(&rConfigItem),
+ m_nSendCount(0),
+ m_nErrorCount(0)
+{
+ m_nStatusHeight = m_aSeparatorFL.GetPosPixel().Y() - m_aStatusLB.GetPosPixel().Y();
+ OUString sTask(SW_RES(ST_TASK));
+ OUString sStatus(SW_RES(ST_STATUS));
+ m_aStatusLB.SetHelpId(HID_MM_SENDMAILS_STATUSLB);
+
+ FreeResource();
+
+ m_aDetailsPB.SetClickHdl(LINK( this, SwSendMailDialog, DetailsHdl_Impl));
+ m_aStopPB.SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl));
+ m_aClosePB.SetClickHdl(LINK( this, SwSendMailDialog, CloseHdl_Impl));
+
+ Size aLBSize(m_aStatusLB.GetSizePixel());
+ m_aStatusHB.SetSizePixel(aLBSize);
+ Size aHeadSize(m_aStatusHB.CalcWindowSizePixel());
+ aHeadSize.Width() = aLBSize.Width();
+ m_aStatusHB.SetSizePixel(aHeadSize);
+ Point aLBPos(m_aStatusLB.GetPosPixel());
+ m_aStatusHB.SetPosPixel(aLBPos);
+ aLBPos.Y() += aHeadSize.Height();
+ aLBSize.Height() -= aHeadSize.Height();
+ m_aStatusLB.SetPosSizePixel(aLBPos, aLBSize);
+
+ Size aSz(m_aStatusHB.GetOutputSizePixel());
+ long nPos1 = aSz.Width()/3 * 2;
+ long nPos2 = aSz.Width()/3;
+ m_aStatusHB.InsertItem( ITEMID_TASK, sTask,
+ nPos1,
+ HIB_LEFT | HIB_VCENTER );
+ m_aStatusHB.InsertItem( ITEMID_STATUS, sStatus,
+ nPos2,
+ HIB_LEFT | HIB_VCENTER );
+ m_aStatusHB.SetHelpId(HID_MM_ADDRESSLIST_HB );
+ m_aStatusHB.Show();
+
+ m_aStatusLB.SetHelpId(HID_MM_MAILSTATUS_TLB);
+ static long nTabs[] = {3, 0, nPos1, aSz.Width() };
+ m_aStatusLB.SetStyle( m_aStatusLB.GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
+ m_aStatusLB.SetSelectionMode( SINGLE_SELECTION );
+ m_aStatusLB.SetTabs(&nTabs[0], MAP_PIXEL);
+ m_aStatusLB.SetSpaceBetweenEntries(3);
+
+ DetailsHdl_Impl( &m_aDetailsPB );
+ UpdateTransferStatus();
+}
+
+SwSendMailDialog::~SwSendMailDialog()
+{
+ if(m_pImpl->xMailDispatcher.is())
+ {
+ try
+ {
+ if(m_pImpl->xMailDispatcher->isStarted())
+ m_pImpl->xMailDispatcher->stop();
+ if(m_pImpl->xConnectedMailService.is() && m_pImpl->xConnectedMailService->isConnected())
+ m_pImpl->xConnectedMailService->disconnect();
+ if(m_pImpl->xConnectedInMailService.is() && m_pImpl->xConnectedInMailService->isConnected())
+ m_pImpl->xConnectedInMailService->disconnect();
+
+ uno::Reference<mail::XMailMessage> xMessage =
+ m_pImpl->xMailDispatcher->dequeueMailMessage();
+ while(xMessage.is())
+ {
+ SwMailDispatcherListener_Impl::DeleteAttachments( xMessage );
+ xMessage = m_pImpl->xMailDispatcher->dequeueMailMessage();
+ }
+ }
+ catch (const uno::Exception&)
+ {
+ }
+ }
+ delete m_pImpl;
+}
+
+void SwSendMailDialog::AddDocument( SwMailDescriptor& rDesc )
+{
+ ::osl::MutexGuard aGuard(m_pImpl->aDescriptorMutex);
+ m_pImpl->aDescriptors.push_back(rDesc);
+ // if the dialog is already running then continue sending of documents
+ if(m_pImpl->xMailDispatcher.is())
+ {
+ IterateMails();
+ }
+
+}
+
+void SwSendMailDialog::SetDocumentCount( sal_Int32 nAllDocuments )
+{
+ m_pImpl->nDocumentCount = nAllDocuments;
+ UpdateTransferStatus();
+}
+
+static void lcl_Move(Control& rCtrl, long nYOffset)
+{
+ Point aPos(rCtrl.GetPosPixel());
+ aPos.Y() += nYOffset;
+ rCtrl.SetPosPixel(aPos);
+}
+
+IMPL_LINK_NOARG(SwSendMailDialog, DetailsHdl_Impl)
+{
+ long nMove = 0;
+ if(m_aStatusLB.IsVisible())
+ {
+ m_aStatusLB.Hide();
+ m_aStatusHB.Hide();
+ nMove = - m_nStatusHeight;
+ m_aDetailsPB.SetText(m_sMore);
+ }
+ else
+ {
+ m_aStatusLB.Show();
+ m_aStatusHB.Show();
+ nMove = m_nStatusHeight;
+ m_aDetailsPB.SetText(m_sLess);
+ }
+ lcl_Move(m_aSeparatorFL, nMove);
+ lcl_Move(m_aStopPB, nMove);
+ lcl_Move(m_aClosePB, nMove);
+ Size aDlgSize = GetSizePixel(); aDlgSize.Height() += nMove; SetSizePixel(aDlgSize);
+
+ return 0;
+}
+
+IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton )
+{
+ m_bCancel = true;
+ if(m_pImpl->xMailDispatcher.is())
+ {
+ if(m_pImpl->xMailDispatcher->isStarted())
+ {
+ m_pImpl->xMailDispatcher->stop();
+ pButton->SetText(m_sContinue);
+ m_PausedFI.Show();
+ }
+ else
+ {
+ m_pImpl->xMailDispatcher->start();
+ pButton->SetText(m_sStop);
+ m_PausedFI.Show(false);
+ }
+ }
+ return 0;
+}
+
+IMPL_LINK_NOARG(SwSendMailDialog, CloseHdl_Impl)
+{
+ ModelessDialog::Show( false );
+ return 0;
+}
+
+IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StartSendMails, SwSendMailDialog*, pDialog )
+{
+ pDialog->SendMails();
+ return 0;
+}
+
+IMPL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer )
+{
+ if( pThis->m_pImpl->xMailDispatcher.is() )
+ {
+ if(pThis->m_pImpl->xMailDispatcher->isStarted())
+ pThis->m_pImpl->xMailDispatcher->stop();
+ if(!pThis->m_pImpl->xMailDispatcher->isShutdownRequested())
+ pThis->m_pImpl->xMailDispatcher->shutdown();
+ }
+
+ if( pThis->m_bDesctructionEnabled &&
+ (!pThis->m_pImpl->xMailDispatcher.is() ||
+ !pThis->m_pImpl->xMailDispatcher->isRunning()))
+ {
+ delete pThis;
+ }
+ else
+ {
+ pTimer->Start();
+ }
+ return 0;
+}
+
+IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog )
+{
+ if(pDialog->m_pImpl->xMailDispatcher.is() &&
+ pDialog->m_pImpl->xMailDispatcher->isStarted())
+ {
+ pDialog->m_pImpl->xMailDispatcher->stop();
+ pDialog->m_aStopPB.SetText(pDialog->m_sContinue);
+ pDialog->m_PausedFI.Show();
+ }
+ return 0;
+}
+
+void SwSendMailDialog::SendMails()
+{
+ if(!m_pConfigItem)
+ {
+ OSL_FAIL("config item not set");
+ return;
+ }
+ EnterWait();
+ //get a mail server connection
+ uno::Reference< mail::XSmtpService > xSmtpServer =
+ SwMailMergeHelper::ConnectToSmtpServer( *m_pConfigItem,
+ m_pImpl->xConnectedInMailService,
+ aEmptyOUStr, aEmptyOUStr, this );
+ bool bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected();
+ LeaveWait();
+ if(!bIsLoggedIn)
+ {
+ OSL_FAIL("create error message");
+ return;
+ }
+ m_pImpl->xMailDispatcher.set( new MailDispatcher(xSmtpServer));
+ IterateMails();
+ m_pImpl->xMailListener = new SwMailDispatcherListener_Impl(*this);
+ m_pImpl->xMailDispatcher->addListener(m_pImpl->xMailListener);
+ if(!m_bCancel)
+ {
+ m_pImpl->xMailDispatcher->start();
+ }
+}
+
+void SwSendMailDialog::IterateMails()
+{
+ const SwMailDescriptor* pCurrentMailDescriptor = m_pImpl->GetNextDescriptor();
+ while( pCurrentMailDescriptor )
+ {
+ if(!SwMailMergeHelper::CheckMailAddress( pCurrentMailDescriptor->sEMail ))
+ {
+ Image aInsertImg = m_aImageList.GetImage( FN_FORMULA_CANCEL );
+
+ OUString sMessage = m_sSendingTo;
+ OUString sTmp(pCurrentMailDescriptor->sEMail);
+ sTmp += "\t";
+ sTmp += m_sFailed;
+ m_aStatusLB.InsertEntry( sMessage.replaceFirst("%1", sTmp), aInsertImg, aInsertImg);
+ ++m_nSendCount;
+ ++m_nErrorCount;
+ UpdateTransferStatus( );
+ pCurrentMailDescriptor = m_pImpl->GetNextDescriptor();
+ continue;
+ }
+ SwMailMessage* pMessage = new SwMailMessage;
+ uno::Reference< mail::XMailMessage > xMessage = pMessage;
+ if(m_pConfigItem->IsMailReplyTo())
+ pMessage->setReplyToAddress(m_pConfigItem->GetMailReplyTo());
+ pMessage->addRecipient( pCurrentMailDescriptor->sEMail );
+ pMessage->SetSenderName( m_pConfigItem->GetMailDisplayName() );
+ pMessage->SetSenderAddress( m_pConfigItem->GetMailAddress() );
+ if(!pCurrentMailDescriptor->sAttachmentURL.isEmpty())
+ {
+ mail::MailAttachment aAttach;
+ aAttach.Data =
+ new SwMailTransferable(
+ pCurrentMailDescriptor->sAttachmentURL,
+ pCurrentMailDescriptor->sAttachmentName,
+ pCurrentMailDescriptor->sMimeType );
+ aAttach.ReadableName = pCurrentMailDescriptor->sAttachmentName;
+ pMessage->addAttachment( aAttach );
+ }
+ pMessage->setSubject( pCurrentMailDescriptor->sSubject );
+ uno::Reference< datatransfer::XTransferable> xBody =
+ new SwMailTransferable(
+ pCurrentMailDescriptor->sBodyContent,
+ pCurrentMailDescriptor->sBodyMimeType);
+ pMessage->setBody( xBody );
+
+ //CC and BCC are tokenized by ';'
+ if(!pCurrentMailDescriptor->sCC.isEmpty())
+ {
+ OUString sTokens( pCurrentMailDescriptor->sCC );
+ sal_uInt16 nTokens = comphelper::string::getTokenCount(sTokens, ';');
+ sal_Int32 nPos = 0;
+ for( sal_uInt16 nToken = 0; nToken < nTokens; ++nToken)
+ {
+ OUString sTmp = sTokens.getToken( 0, ';', nPos);
+ if( !sTmp.isEmpty() )
+ pMessage->addCcRecipient( sTmp );
+ }
+ }
+ if(!pCurrentMailDescriptor->sBCC.isEmpty())
+ {
+ OUString sTokens( pCurrentMailDescriptor->sBCC );
+ sal_uInt16 nTokens = comphelper::string::getTokenCount(sTokens, ';');
+ sal_Int32 nPos = 0;
+ for( sal_uInt16 nToken = 0; nToken < nTokens; ++nToken)
+ {
+ OUString sTmp = sTokens.getToken( 0, ';', nPos);
+ if( !sTmp.isEmpty() )
+ pMessage->addBccRecipient( sTmp );
+ }
+ }
+ m_pImpl->xMailDispatcher->enqueueMailMessage( xMessage );
+ pCurrentMailDescriptor = m_pImpl->GetNextDescriptor();
+ }
+ UpdateTransferStatus();
+}
+
+void SwSendMailDialog::ShowDialog()
+{
+ Application::PostUserEvent( STATIC_LINK( this, SwSendMailDialog,
+ StartSendMails ), this );
+ ModelessDialog::Show();
+}
+
+void SwSendMailDialog::StateChanged( StateChangedType nStateChange )
+{
+ ModelessDialog::StateChanged( nStateChange );
+ if(STATE_CHANGE_VISIBLE == nStateChange && !IsVisible())
+ {
+ m_pImpl->aRemoveTimer.SetTimeoutHdl( STATIC_LINK( this, SwSendMailDialog,
+ RemoveThis ) );
+ m_pImpl->aRemoveTimer.Start();
+ }
+}
+
+void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessage,
+ bool bResult,
+ const OUString* pError )
+{
+ //sending should stop on send errors
+ if(pError &&
+ m_pImpl->xMailDispatcher.is() && m_pImpl->xMailDispatcher->isStarted())
+ {
+ Application::PostUserEvent( STATIC_LINK( this, SwSendMailDialog,
+ StopSendMails ), this );
+ }
+ Image aInsertImg = m_aImageList.GetImage( bResult ? FN_FORMULA_APPLY : FN_FORMULA_CANCEL );
+
+ OUString sMessage = m_sSendingTo;
+ OUString sTmp(xMessage->getRecipients()[0]);
+ sTmp += "\t";
+ sTmp += bResult ? m_sCompleted : m_sFailed;
+ m_aStatusLB.InsertEntry( sMessage.replaceFirst("%1", sTmp), aInsertImg, aInsertImg);
+ ++m_nSendCount;
+ if(!bResult)
+ ++m_nErrorCount;
+
+ UpdateTransferStatus( );
+
+ if (pError)
+ {
+ SwSendWarningBox_Impl* pDlg = new SwSendWarningBox_Impl(0, *pError);
+ pDlg->Execute();
+ delete pDlg;
+ }
+}
+
+void SwSendMailDialog::UpdateTransferStatus()
+{
+ OUString sStatus( m_sTransferStatus );
+ sStatus = sStatus.replaceFirst("%1", OUString::number(m_nSendCount) );
+ sStatus = sStatus.replaceFirst("%2", OUString::number(m_pImpl->aDescriptors.size()));
+ m_aTransferStatusFT.SetText(sStatus);
+
+ sStatus = m_sErrorStatus.replaceFirst("%1", OUString::number(m_nErrorCount) );
+ m_aErrorStatusFT.SetText(sStatus);
+
+ if(m_pImpl->aDescriptors.size())
+ m_aProgressBar.SetValue((sal_uInt16)(m_nSendCount * 100 / m_pImpl->aDescriptors.size()));
+ else
+ m_aProgressBar.SetValue(0);
+}
+
+void SwSendMailDialog::AllMailsSent()
+{
+ m_aStopPB.Enable(false);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx
index b92593a..1334720 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx
@@ -25,18 +25,8 @@
#include <view.hxx>
#include <edtwin.hxx>
#include <vcl/layout.hxx>
-#include <vcl/svapp.hxx>
#include <mailmergechildwindow.hxx>
-#include <../../ui/dbui/mmoutputpage.hxx>
#include <mmconfigitem.hxx>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/string.hxx>
-#include <com/sun/star/mail/XSmtpService.hpp>
-#include <com/sun/star/mail/MailServiceType.hpp>
-#include <rtl/ref.hxx>
-#include <maildispatcher.hxx>
-#include <imaildsplistener.hxx>
-#include <swunohelper.hxx>
#include <svtools/svmedit.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/image.hxx>
@@ -111,556 +101,4 @@ void SwMailMergeChildWin::FillInfo(SfxChildWinInfo& rInfo) const
rInfo.bVisible = false;
}
-struct SwSendMailDialog_Impl
-{
- friend class SwSendMailDialog;
- ::osl::Mutex aDescriptorMutex;
-
- ::std::vector< SwMailDescriptor > aDescriptors;
- sal_uInt32 nCurrentDescriptor;
- sal_uInt32 nDocumentCount;
- ::rtl::Reference< MailDispatcher > xMailDispatcher;
- ::rtl::Reference< IMailDispatcherListener> xMailListener;
- uno::Reference< mail::XMailService > xConnectedMailService;
- uno::Reference< mail::XMailService > xConnectedInMailService;
- Timer aRemoveTimer;
-
- SwSendMailDialog_Impl() :
- nCurrentDescriptor(0),
- nDocumentCount(0)
- {
- aRemoveTimer.SetTimeout(500);
- }
-
- ~SwSendMailDialog_Impl()
- {
- // Shutdown must be called when the last reference to the
- // mail dispatcher will be released in order to force a
- // shutdown of the mail dispatcher thread.
- // 'join' with the mail dispatcher thread leads to a
- // deadlock (SolarMutex).
- if( xMailDispatcher.is() && !xMailDispatcher->isShutdownRequested() )
- xMailDispatcher->shutdown();
- }
- const SwMailDescriptor* GetNextDescriptor();
-};
-
-const SwMailDescriptor* SwSendMailDialog_Impl::GetNextDescriptor()
-{
- ::osl::MutexGuard aGuard(aDescriptorMutex);
- if(nCurrentDescriptor < aDescriptors.size())
- {
- ++nCurrentDescriptor;
- return &aDescriptors[nCurrentDescriptor - 1];
- }
- return 0;
-}
-
-class SwMailDispatcherListener_Impl : public IMailDispatcherListener
-{
- SwSendMailDialog* m_pSendMailDialog;
-
-public:
- SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg);
- virtual ~SwMailDispatcherListener_Impl();
-
- virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE;
- virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE;
- virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE;
- virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher,
- uno::Reference< mail::XMailMessage> xMailMessage) SAL_OVERRIDE;
- virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher,
- uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) SAL_OVERRIDE;
-
- static void DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage );
-};
-
-SwMailDispatcherListener_Impl::SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg) :
- m_pSendMailDialog(&rParentDlg)
-{
-}
-
-SwMailDispatcherListener_Impl::~SwMailDispatcherListener_Impl()
-{
-}
-
-void SwMailDispatcherListener_Impl::started(::rtl::Reference<MailDispatcher> /*xMailDispatcher*/)
-{
-}
-
-void SwMailDispatcherListener_Impl::stopped(
- ::rtl::Reference<MailDispatcher> /*xMailDispatcher*/)
-{
-}
-
-void SwMailDispatcherListener_Impl::idle(::rtl::Reference<MailDispatcher> /*xMailDispatcher*/)
-{
- SolarMutexGuard aGuard;
- m_pSendMailDialog->AllMailsSent();
-}
-
-void SwMailDispatcherListener_Impl::mailDelivered(
- ::rtl::Reference<MailDispatcher> /*xMailDispatcher*/,
- uno::Reference< mail::XMailMessage> xMailMessage)
-{
- SolarMutexGuard aGuard;
- m_pSendMailDialog->DocumentSent( xMailMessage, true, 0 );
- DeleteAttachments( xMailMessage );
-}
-
-void SwMailDispatcherListener_Impl::mailDeliveryError(
- ::rtl::Reference<MailDispatcher> /*xMailDispatcher*/,
- uno::Reference< mail::XMailMessage> xMailMessage,
- const OUString& sErrorMessage)
-{
- SolarMutexGuard aGuard;
- m_pSendMailDialog->DocumentSent( xMailMessage, false, &sErrorMessage );
- DeleteAttachments( xMailMessage );
-}
-
-void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage )
-{
- uno::Sequence< mail::MailAttachment > aAttachments = xMessage->getAttachments();
-
- for(sal_Int32 nFile = 0; nFile < aAttachments.getLength(); ++nFile)
- {
- try
- {
- uno::Reference< beans::XPropertySet > xTransferableProperties( aAttachments[nFile].Data, uno::UNO_QUERY_THROW);
- if( xTransferableProperties.is() )
- {
- OUString sURL;
- xTransferableProperties->getPropertyValue("URL") >>= sURL;
- if(!sURL.isEmpty())
- SWUnoHelper::UCB_DeleteFile( sURL );
- }
- }
- catch (const uno::Exception&)
- {
- }
- }
-}
-
-class SwSendWarningBox_Impl : public MessageDialog
-{
- VclMultiLineEdit *m_pDetailED;
-public:
- SwSendWarningBox_Impl(Window* pParent, const OUString& rDetails);
-};
-
-SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const OUString& rDetails)
- : MessageDialog(pParent, "WarnEmailDialog", "modules/swriter/ui/warnemaildialog.ui")
-{
- get(m_pDetailED, "errors");
- m_pDetailED->SetMaxTextWidth(80 * m_pDetailED->approximate_char_width());
- m_pDetailED->set_width_request(80 * m_pDetailED->approximate_char_width());
- m_pDetailED->set_height_request(8 * m_pDetailED->GetTextHeight());
- m_pDetailED->SetText(rDetails);
-}
-
-#define ITEMID_TASK 1
-#define ITEMID_STATUS 2
-
-SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConfigItem) :
- ModelessDialog /*SfxModalDialog*/(pParent, SW_RES(DLG_MM_SENDMAILS)),
- m_aStatusFL( this, SW_RES( FL_STATUS )),
- m_aStatusFT( this, SW_RES( FT_STATUS1 )),
- m_aTransferStatusFL( this, SW_RES( FL_TRANSFERSTATUS )),
- m_aTransferStatusFT( this, SW_RES( FT_TRANSFERSTATUS )),
- m_PausedFI(this, SW_RES( FI_PAUSED )),
- m_aProgressBar( this, SW_RES( PB_PROGRESS )),
- m_aErrorStatusFT( this, SW_RES( FT_ERRORSTATUS )),
- m_aDetailsPB( this, SW_RES( PB_DETAILS )),
- m_aStatusHB( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
- m_aStatusLB( this, SW_RES( LB_STATUS )),
- m_aSeparatorFL( this, SW_RES( FL_SEPARATOR )),
- m_aStopPB( this, SW_RES( PB_STOP )),
- m_aClosePB( this, SW_RES( PB_CLOSE )),
- m_sMore(m_aDetailsPB.GetText()),
- m_sLess(SW_RES(ST_LESS)),
- m_sContinue(SW_RES( ST_CONTINUE )),
- m_sStop(m_aStopPB.GetText()),
- m_sSend(SW_RES(ST_SEND)),
- m_sTransferStatus(m_aTransferStatusFT.GetText()),
- m_sErrorStatus( m_aErrorStatusFT.GetText()),
- m_sSendingTo( SW_RES(ST_SENDINGTO )),
- m_sCompleted( SW_RES(ST_COMPLETED )),
- m_sFailed( SW_RES(ST_FAILED )),
- m_sTerminateQuery( SW_RES( ST_TERMINATEQUERY )),
- m_bCancel(false),
- m_bDesctructionEnabled(false),
- m_aImageList( SW_RES( ILIST ) ),
- m_pImpl(new SwSendMailDialog_Impl),
- m_pConfigItem(&rConfigItem),
- m_nSendCount(0),
- m_nErrorCount(0)
-{
- m_nStatusHeight = m_aSeparatorFL.GetPosPixel().Y() - m_aStatusLB.GetPosPixel().Y();
- OUString sTask(SW_RES(ST_TASK));
- OUString sStatus(SW_RES(ST_STATUS));
- m_aStatusLB.SetHelpId(HID_MM_SENDMAILS_STATUSLB);
-
- FreeResource();
-
- m_aDetailsPB.SetClickHdl(LINK( this, SwSendMailDialog, DetailsHdl_Impl));
- m_aStopPB.SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl));
- m_aClosePB.SetClickHdl(LINK( this, SwSendMailDialog, CloseHdl_Impl));
-
- Size aLBSize(m_aStatusLB.GetSizePixel());
- m_aStatusHB.SetSizePixel(aLBSize);
- Size aHeadSize(m_aStatusHB.CalcWindowSizePixel());
- aHeadSize.Width() = aLBSize.Width();
- m_aStatusHB.SetSizePixel(aHeadSize);
- Point aLBPos(m_aStatusLB.GetPosPixel());
- m_aStatusHB.SetPosPixel(aLBPos);
- aLBPos.Y() += aHeadSize.Height();
- aLBSize.Height() -= aHeadSize.Height();
- m_aStatusLB.SetPosSizePixel(aLBPos, aLBSize);
-
- Size aSz(m_aStatusHB.GetOutputSizePixel());
- long nPos1 = aSz.Width()/3 * 2;
- long nPos2 = aSz.Width()/3;
- m_aStatusHB.InsertItem( ITEMID_TASK, sTask,
- nPos1,
- HIB_LEFT | HIB_VCENTER );
- m_aStatusHB.InsertItem( ITEMID_STATUS, sStatus,
- nPos2,
- HIB_LEFT | HIB_VCENTER );
- m_aStatusHB.SetHelpId(HID_MM_ADDRESSLIST_HB );
- m_aStatusHB.Show();
-
- m_aStatusLB.SetHelpId(HID_MM_MAILSTATUS_TLB);
- static long nTabs[] = {3, 0, nPos1, aSz.Width() };
- m_aStatusLB.SetStyle( m_aStatusLB.GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
- m_aStatusLB.SetSelectionMode( SINGLE_SELECTION );
- m_aStatusLB.SetTabs(&nTabs[0], MAP_PIXEL);
- m_aStatusLB.SetSpaceBetweenEntries(3);
-
- DetailsHdl_Impl( &m_aDetailsPB );
- UpdateTransferStatus();
-}
-
-SwSendMailDialog::~SwSendMailDialog()
-{
- if(m_pImpl->xMailDispatcher.is())
- {
- try
- {
- if(m_pImpl->xMailDispatcher->isStarted())
- m_pImpl->xMailDispatcher->stop();
- if(m_pImpl->xConnectedMailService.is() && m_pImpl->xConnectedMailService->isConnected())
- m_pImpl->xConnectedMailService->disconnect();
- if(m_pImpl->xConnectedInMailService.is() && m_pImpl->xConnectedInMailService->isConnected())
- m_pImpl->xConnectedInMailService->disconnect();
-
- uno::Reference<mail::XMailMessage> xMessage =
- m_pImpl->xMailDispatcher->dequeueMailMessage();
- while(xMessage.is())
- {
- SwMailDispatcherListener_Impl::DeleteAttachments( xMessage );
- xMessage = m_pImpl->xMailDispatcher->dequeueMailMessage();
- }
- }
- catch (const uno::Exception&)
- {
- }
- }
- delete m_pImpl;
-}
-
-void SwSendMailDialog::AddDocument( SwMailDescriptor& rDesc )
-{
- ::osl::MutexGuard aGuard(m_pImpl->aDescriptorMutex);
- m_pImpl->aDescriptors.push_back(rDesc);
- // if the dialog is already running then continue sending of documents
- if(m_pImpl->xMailDispatcher.is())
- {
- IterateMails();
- }
-
-}
-
-void SwSendMailDialog::SetDocumentCount( sal_Int32 nAllDocuments )
-{
- m_pImpl->nDocumentCount = nAllDocuments;
- UpdateTransferStatus();
-}
-
-static void lcl_Move(Control& rCtrl, long nYOffset)
-{
- Point aPos(rCtrl.GetPosPixel());
- aPos.Y() += nYOffset;
- rCtrl.SetPosPixel(aPos);
-}
-
-IMPL_LINK_NOARG(SwSendMailDialog, DetailsHdl_Impl)
-{
- long nMove = 0;
- if(m_aStatusLB.IsVisible())
- {
- m_aStatusLB.Hide();
- m_aStatusHB.Hide();
- nMove = - m_nStatusHeight;
- m_aDetailsPB.SetText(m_sMore);
- }
- else
- {
- m_aStatusLB.Show();
- m_aStatusHB.Show();
- nMove = m_nStatusHeight;
- m_aDetailsPB.SetText(m_sLess);
- }
- lcl_Move(m_aSeparatorFL, nMove);
- lcl_Move(m_aStopPB, nMove);
- lcl_Move(m_aClosePB, nMove);
- Size aDlgSize = GetSizePixel(); aDlgSize.Height() += nMove; SetSizePixel(aDlgSize);
-
- return 0;
-}
-
-IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton )
-{
- m_bCancel = true;
- if(m_pImpl->xMailDispatcher.is())
- {
- if(m_pImpl->xMailDispatcher->isStarted())
- {
- m_pImpl->xMailDispatcher->stop();
- pButton->SetText(m_sContinue);
- m_PausedFI.Show();
- }
- else
- {
- m_pImpl->xMailDispatcher->start();
- pButton->SetText(m_sStop);
- m_PausedFI.Show(false);
- }
- }
- return 0;
-}
-
-IMPL_LINK_NOARG(SwSendMailDialog, CloseHdl_Impl)
-{
- ModelessDialog::Show( false );
- return 0;
-}
-
-IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StartSendMails, SwSendMailDialog*, pDialog )
-{
- pDialog->SendMails();
- return 0;
-}
-
-IMPL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer )
-{
- if( pThis->m_pImpl->xMailDispatcher.is() )
- {
- if(pThis->m_pImpl->xMailDispatcher->isStarted())
- pThis->m_pImpl->xMailDispatcher->stop();
- if(!pThis->m_pImpl->xMailDispatcher->isShutdownRequested())
- pThis->m_pImpl->xMailDispatcher->shutdown();
- }
-
- if( pThis->m_bDesctructionEnabled &&
- (!pThis->m_pImpl->xMailDispatcher.is() ||
- !pThis->m_pImpl->xMailDispatcher->isRunning()))
- {
- delete pThis;
- }
- else
- {
- pTimer->Start();
- }
- return 0;
-}
-
-IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog )
-{
- if(pDialog->m_pImpl->xMailDispatcher.is() &&
- pDialog->m_pImpl->xMailDispatcher->isStarted())
- {
- pDialog->m_pImpl->xMailDispatcher->stop();
- pDialog->m_aStopPB.SetText(pDialog->m_sContinue);
- pDialog->m_PausedFI.Show();
- }
- return 0;
-}
-
-void SwSendMailDialog::SendMails()
-{
- if(!m_pConfigItem)
- {
- OSL_FAIL("config item not set");
- return;
- }
- EnterWait();
- //get a mail server connection
- uno::Reference< mail::XSmtpService > xSmtpServer =
- SwMailMergeHelper::ConnectToSmtpServer( *m_pConfigItem,
- m_pImpl->xConnectedInMailService,
- aEmptyOUStr, aEmptyOUStr, this );
- bool bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected();
- LeaveWait();
- if(!bIsLoggedIn)
- {
- OSL_FAIL("create error message");
- return;
- }
- m_pImpl->xMailDispatcher.set( new MailDispatcher(xSmtpServer));
- IterateMails();
- m_pImpl->xMailListener = new SwMailDispatcherListener_Impl(*this);
- m_pImpl->xMailDispatcher->addListener(m_pImpl->xMailListener);
- if(!m_bCancel)
- {
- m_pImpl->xMailDispatcher->start();
- }
-}
-
-void SwSendMailDialog::IterateMails()
-{
- const SwMailDescriptor* pCurrentMailDescriptor = m_pImpl->GetNextDescriptor();
- while( pCurrentMailDescriptor )
- {
- if(!SwMailMergeHelper::CheckMailAddress( pCurrentMailDescriptor->sEMail ))
- {
- Image aInsertImg = m_aImageList.GetImage( FN_FORMULA_CANCEL );
-
- OUString sMessage = m_sSendingTo;
- OUString sTmp(pCurrentMailDescriptor->sEMail);
- sTmp += "\t";
- sTmp += m_sFailed;
- m_aStatusLB.InsertEntry( sMessage.replaceFirst("%1", sTmp), aInsertImg, aInsertImg);
- ++m_nSendCount;
- ++m_nErrorCount;
- UpdateTransferStatus( );
- pCurrentMailDescriptor = m_pImpl->GetNextDescriptor();
- continue;
- }
- SwMailMessage* pMessage = new SwMailMessage;
- uno::Reference< mail::XMailMessage > xMessage = pMessage;
- if(m_pConfigItem->IsMailReplyTo())
- pMessage->setReplyToAddress(m_pConfigItem->GetMailReplyTo());
- pMessage->addRecipient( pCurrentMailDescriptor->sEMail );
- pMessage->SetSenderName( m_pConfigItem->GetMailDisplayName() );
- pMessage->SetSenderAddress( m_pConfigItem->GetMailAddress() );
- if(!pCurrentMailDescriptor->sAttachmentURL.isEmpty())
- {
- mail::MailAttachment aAttach;
- aAttach.Data =
- new SwMailTransferable(
- pCurrentMailDescriptor->sAttachmentURL,
- pCurrentMailDescriptor->sAttachmentName,
- pCurrentMailDescriptor->sMimeType );
- aAttach.ReadableName = pCurrentMailDescriptor->sAttachmentName;
- pMessage->addAttachment( aAttach );
- }
- pMessage->setSubject( pCurrentMailDescriptor->sSubject );
- uno::Reference< datatransfer::XTransferable> xBody =
- new SwMailTransferable(
- pCurrentMailDescriptor->sBodyContent,
- pCurrentMailDescriptor->sBodyMimeType);
- pMessage->setBody( xBody );
-
- //CC and BCC are tokenized by ';'
- if(!pCurrentMailDescriptor->sCC.isEmpty())
- {
- OUString sTokens( pCurrentMailDescriptor->sCC );
- sal_uInt16 nTokens = comphelper::string::getTokenCount(sTokens, ';');
- sal_Int32 nPos = 0;
- for( sal_uInt16 nToken = 0; nToken < nTokens; ++nToken)
- {
- OUString sTmp = sTokens.getToken( 0, ';', nPos);
- if( !sTmp.isEmpty() )
- pMessage->addCcRecipient( sTmp );
- }
- }
- if(!pCurrentMailDescriptor->sBCC.isEmpty())
- {
- OUString sTokens( pCurrentMailDescriptor->sBCC );
- sal_uInt16 nTokens = comphelper::string::getTokenCount(sTokens, ';');
- sal_Int32 nPos = 0;
- for( sal_uInt16 nToken = 0; nToken < nTokens; ++nToken)
- {
- OUString sTmp = sTokens.getToken( 0, ';', nPos);
- if( !sTmp.isEmpty() )
- pMessage->addBccRecipient( sTmp );
- }
- }
- m_pImpl->xMailDispatcher->enqueueMailMessage( xMessage );
- pCurrentMailDescriptor = m_pImpl->GetNextDescriptor();
- }
- UpdateTransferStatus();
-}
-
-void SwSendMailDialog::ShowDialog()
-{
- Application::PostUserEvent( STATIC_LINK( this, SwSendMailDialog,
- StartSendMails ), this );
- ModelessDialog::Show();
-}
-
-void SwSendMailDialog::StateChanged( StateChangedType nStateChange )
-{
- ModelessDialog::StateChanged( nStateChange );
- if(STATE_CHANGE_VISIBLE == nStateChange && !IsVisible())
- {
- m_pImpl->aRemoveTimer.SetTimeoutHdl( STATIC_LINK( this, SwSendMailDialog,
- RemoveThis ) );
- m_pImpl->aRemoveTimer.Start();
- }
-}
-
-void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessage,
- bool bResult,
- const OUString* pError )
-{
- //sending should stop on send errors
- if(pError &&
- m_pImpl->xMailDispatcher.is() && m_pImpl->xMailDispatcher->isStarted())
- {
- Application::PostUserEvent( STATIC_LINK( this, SwSendMailDialog,
- StopSendMails ), this );
- }
- Image aInsertImg = m_aImageList.GetImage( bResult ? FN_FORMULA_APPLY : FN_FORMULA_CANCEL );
-
- OUString sMessage = m_sSendingTo;
- OUString sTmp(xMessage->getRecipients()[0]);
- sTmp += "\t";
- sTmp += bResult ? m_sCompleted : m_sFailed;
- m_aStatusLB.InsertEntry( sMessage.replaceFirst("%1", sTmp), aInsertImg, aInsertImg);
- ++m_nSendCount;
- if(!bResult)
- ++m_nErrorCount;
-
- UpdateTransferStatus( );
-
- if (pError)
- {
- SwSendWarningBox_Impl* pDlg = new SwSendWarningBox_Impl(0, *pError);
- pDlg->Execute();
- delete pDlg;
- }
-}
-
-void SwSendMailDialog::UpdateTransferStatus()
-{
- OUString sStatus( m_sTransferStatus );
- sStatus = sStatus.replaceFirst("%1", OUString::number(m_nSendCount) );
- sStatus = sStatus.replaceFirst("%2", OUString::number(m_pImpl->aDescriptors.size()));
- m_aTransferStatusFT.SetText(sStatus);
-
- sStatus = m_sErrorStatus.replaceFirst("%1", OUString::number(m_nErrorCount) );
- m_aErrorStatusFT.SetText(sStatus);
-
- if(m_pImpl->aDescriptors.size())
- m_aProgressBar.SetValue((sal_uInt16)(m_nSendCount * 100 / m_pImpl->aDescriptors.size()));
- else
- m_aProgressBar.SetValue(0);
-}
-
-void SwSendMailDialog::AllMailsSent()
-{
- m_aStopPB.Enable(false);
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx
index 0c3b821..4da0e5d 100644
--- a/sw/source/uibase/inc/maildispatcher.hxx
+++ b/sw/source/uibase/inc/maildispatcher.hxx
@@ -28,6 +28,8 @@
#include <list>
+#include <swdllapi.h>
+
class IMailDispatcherListener;
/**
@@ -37,7 +39,9 @@ class IMailDispatcherListener;
must not be shared among different client threads. Instead each client
thread should create an own instance of this class.
*/
-class MailDispatcher : public ::salhelper::ReferenceObject, private ::osl::Thread
+class SW_DLLPUBLIC MailDispatcher
+ : public ::salhelper::ReferenceObject
+ , private ::osl::Thread
{
public:
// bringing operator new/delete into scope
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index 886222c..6c57fbb 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -200,7 +200,7 @@ public:
throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-class SwMailTransferable :
+class SW_DLLPUBLIC SwMailTransferable :
public SwMutexBase,
public cppu::WeakComponentImplHelper2
<
@@ -239,7 +239,7 @@ class SwMailTransferable :
};
-class SwMailMessage :
+class SW_DLLPUBLIC SwMailMessage :
public SwMutexBase,
public cppu::WeakComponentImplHelper1< ::com::sun::star::mail::XMailMessage >
{
commit 347e705d251c53de8f5af53cb6b3476dd9ac3415
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon May 26 17:46:32 2014 +0200
sw: document uibase dir
Change-Id: I88ccba75c9cb1d31654f20245a52a4de28933189
diff --git a/sw/README b/sw/README
index f78020ad..fe62175 100644
--- a/sw/README
+++ b/sw/README
@@ -24,7 +24,8 @@ comments show that Writer core dates back until at least November
* ww1
* ww8: DOC import, DOC/DOCX/RTF export
* xml: ODF import/export, subclassed from xmloff (where most of the work is done)
- * ui: user interface
+ * uibase: user interface (those parts that are linked into sw & always loaded)
+ * ui: user interface (optional parts that are loaded on demand (swui))
== Core ==
commit 35029b250318b3a4f02cef5194abdd3f68311c43
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon May 26 17:43:14 2014 +0200
sw: move sw/source/core/uibase to sw/source/uibase
It's too confusing to have UI code inside of core; the important part is
that it's separated from the optional UI code in swui library.
Change-Id: I640a52723d5802faf08f3b8eaa03cd937fd93449
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d1771f2..f988719 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2308,7 +2308,7 @@ Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent )
(ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
The initial color used by the button is set in /core/svx/source/tbxcntrls/tbcontrl.cxx
(SvxColorToolBoxControl::SvxColorToolBoxControl())
- and in case of writer for text(background)color also in /core/sw/source/core/uibase/docvw/edtwin.cxx
+ and in case of writer for text(background)color also in /core/sw/source/uibase/docvw/edtwin.cxx
(SwEditWin::m_aTextBackColor and SwEditWin::m_aTextColor)
*/
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index fc12a36..f05d690 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -39,7 +39,7 @@ namespace svx
(ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
The initial color used by the button is set in /core/svx/source/tbxctrls/tbcontrl.cxx
(SvxColorToolBoxControl::SvxColorToolBoxControl())
- and in case of writer for text(background)color also in /core/sw/source/core/uibase/docvw/edtwin.cxx
+ and in case of writer for text(background)color also in /core/sw/source/uibase/docvw/edtwin.cxx
(SwEditWin::m_aTextBackColor and SwEditWin::m_aTextColor)
*/
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 51114bd..c5176fc 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -33,13 +33,13 @@ $(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/uibase/inc \
+ -I$(SRCDIR)/sw/source/uibase/docvw \
+ -I$(SRCDIR)/sw/source/uibase/envelp \
+ -I$(SRCDIR)/sw/source/uibase/index \
+ -I$(SRCDIR)/sw/source/uibase/sidebar \
-I$(SRCDIR)/sw/source/ui/chrdlg \
-I$(SRCDIR)/sw/source/ui/config \
-I$(SRCDIR)/sw/source/ui/dbui \
@@ -69,20 +69,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/uibase/dialog/regionsw.src \
+ sw/source/uibase/docvw/docvw.src \
+ sw/source/uibase/lingu/olmenu.src \
+ sw/source/uibase/misc/redlndlg.src \
+ sw/source/uibase/ribbar/inputwin.src \
+ sw/source/uibase/ribbar/workctrl.src \
+ sw/source/uibase/smartmenu/stmenu.src \
+ sw/source/uibase/uiview/view.src \
+ sw/source/uibase/utlui/attrdesc.src \
+ sw/source/uibase/utlui/navipi.src \
+ sw/source/uibase/utlui/initui.src \
+ sw/source/uibase/wrtsh/wrtsh.src \
+ sw/source/uibase/utlui/unotools.src \
+ sw/source/uibase/dbui/mailmergechildwindow.src \
sw/source/ui/app/app.src \
sw/source/ui/app/error.src \
sw/source/ui/app/mn.src \
@@ -128,7 +128,7 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,sw/res,\
))
$(eval $(call gb_SrsTarget_add_templates,sw/res,\
- sw/source/core/uibase/inc/redline_tmpl.hrc \
+ sw/source/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 3774e92..ad79cfd 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_htmlexport,\
$(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/core/uibase/inc \
+ -I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
$$(INCLUDE) \
))
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index 60424f6..95e452d 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -38,7 +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/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
$$(INCLUDE) \
))
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index 54152f5..2592543 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -38,7 +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/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
$$(INCLUDE) \
))
diff --git a/sw/Executable_tiledrendering.mk b/sw/Executable_tiledrendering.mk
index b66092d..089b0f5 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/core/uibase/inc \
+ -I$(SRCDIR)/sw/source/uibase/inc \
$$(INCLUDE) \
))
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index b84e9fc..c9fe775 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/core/uibase/inc \
+ -I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/inc \
-I$(WORKDIR)/SdiTarget/sw/sdi \
$$(INCLUDE) \
@@ -541,219 +541,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/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/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 \
+ sw/source/uibase/app/appenv \
+ sw/source/uibase/app/apphdl \
+ sw/source/uibase/app/applab \
+ sw/source/uibase/app/appopt \
+ sw/source/uibase/app/docsh \
+ sw/source/uibase/app/docsh2 \
+ sw/source/uibase/app/docshdrw \
+ sw/source/uibase/app/docshini \
+ sw/source/uibase/app/docst \
+ sw/source/uibase/app/docstyle \
+ sw/source/uibase/app/mainwn \
+ sw/source/uibase/app/swdll \
+ sw/source/uibase/app/swmodul1 \
+ sw/source/uibase/app/swmodule \
+ sw/source/uibase/app/swwait \
+ sw/source/uibase/cctrl/actctrl \
+ sw/source/uibase/cctrl/popbox \
+ sw/source/uibase/cctrl/swlbox \
+ sw/source/uibase/chrdlg/ccoll \
+ sw/source/uibase/config/barcfg \
+ sw/source/uibase/config/caption \
+ sw/source/uibase/config/cfgitems \
+ sw/source/uibase/config/dbconfig \
+ sw/source/uibase/config/fontcfg \
+ sw/source/uibase/config/modcfg \
+ sw/source/uibase/config/prtopt \
+ sw/source/uibase/config/uinums \
+ sw/source/uibase/config/usrpref \
+ sw/source/uibase/config/viewopt \
+ sw/source/uibase/dialog/SwSpellDialogChildWindow \
+ sw/source/uibase/dialog/regionsw \
+ sw/source/uibase/dialog/swabstdlg \
+ sw/source/uibase/dialog/swwrtshitem \
+ sw/source/uibase/dochdl/gloshdl \
+ sw/source/uibase/dochdl/swdtflvr \
+ sw/source/uibase/docvw/AnchorOverlayObject \
+ sw/source/uibase/docvw/AnnotationMenuButton \
+ sw/source/uibase/docvw/AnnotationWin \
+ sw/source/uibase/docvw/DashedLine \
+ sw/source/uibase/docvw/FrameControlsManager \
+ sw/source/uibase/docvw/PageBreakWin \
+ sw/source/uibase/docvw/OverlayRanges \
+ sw/source/uibase/docvw/PostItMgr \
+ sw/source/uibase/docvw/ShadowOverlayObject \
+ sw/source/uibase/docvw/SidebarTxtControl \
+ sw/source/uibase/docvw/SidebarTxtControlAcc \
+ sw/source/uibase/docvw/SidebarWin \
+ sw/source/uibase/docvw/SidebarWinAcc \
+ sw/source/uibase/docvw/HeaderFooterWin \
+ sw/source/uibase/docvw/edtdd \
+ sw/source/uibase/docvw/edtwin \
+ sw/source/uibase/docvw/edtwin2 \
+ sw/source/uibase/docvw/edtwin3 \
+ sw/source/uibase/docvw/frmsidebarwincontainer \
+ sw/source/uibase/docvw/romenu \
+ sw/source/uibase/docvw/srcedtw \
+ sw/source/uibase/envelp/envimg \
+ sw/source/uibase/envelp/labelcfg \
+ sw/source/uibase/envelp/labimg \
+ sw/source/uibase/envelp/syncbtn \
+ sw/source/uibase/fldui/fldmgr \
+ sw/source/uibase/fldui/fldwrap \
+ sw/source/uibase/fldui/xfldui \
+ sw/source/uibase/frmdlg/colex \
+ sw/source/uibase/frmdlg/colmgr \
+ sw/source/uibase/frmdlg/frmmgr \
+ sw/source/uibase/globdoc/globdoc \
+ sw/source/uibase/index/idxmrk \
+ sw/source/uibase/dialog/wordcountwrapper \
+ sw/source/uibase/index/toxmgr \
+ sw/source/uibase/lingu/hhcwrp \
+ sw/source/uibase/lingu/hyp \
+ sw/source/uibase/lingu/olmenu \
+ sw/source/uibase/lingu/sdrhhcwrap \
+ sw/source/uibase/misc/glosdoc \
+ sw/source/uibase/misc/glshell \
+ sw/source/uibase/misc/numberingtypelistbox \
+ sw/source/uibase/misc/redlndlg \
+ sw/source/uibase/misc/swruler \
+ sw/source/uibase/ribbar/conarc \
+ sw/source/uibase/ribbar/concustomshape \
+ sw/source/uibase/ribbar/conform \
+ sw/source/uibase/ribbar/conpoly \
+ sw/source/uibase/ribbar/conrect \
+ sw/source/uibase/ribbar/drawbase \
+ sw/source/uibase/ribbar/dselect \
+ sw/source/uibase/ribbar/inputwin \
+ sw/source/uibase/ribbar/tblctrl \
+ sw/source/uibase/ribbar/tbxanchr \
+ sw/source/uibase/ribbar/workctrl \
+ sw/source/uibase/shells/annotsh \
+ sw/source/uibase/shells/basesh \
+ sw/source/uibase/shells/beziersh \
+ sw/source/uibase/shells/drawdlg \
+ sw/source/uibase/shells/drawsh \
+ sw/source/uibase/shells/drformsh \
+ sw/source/uibase/shells/drwbassh \
+ sw/source/uibase/shells/drwtxtex \
+ sw/source/uibase/shells/drwtxtsh \
+ sw/source/uibase/shells/frmsh \
+ sw/source/uibase/shells/grfsh \
+ sw/source/uibase/shells/grfshex \
+ sw/source/uibase/shells/langhelper \
+ sw/source/uibase/shells/listsh \
+ sw/source/uibase/shells/mediash \
+ sw/source/uibase/shells/navsh \
+ sw/source/uibase/shells/olesh \
+ sw/source/uibase/shells/slotadd \
+ sw/source/uibase/shells/tabsh \
+ sw/source/uibase/shells/textdrw \
+ sw/source/uibase/shells/textfld \
+ sw/source/uibase/shells/textglos \
+ sw/source/uibase/shells/textidx \
+ sw/source/uibase/shells/textsh \
+ sw/source/uibase/shells/textsh1 \
+ sw/source/uibase/shells/textsh2 \
+ sw/source/uibase/shells/txtattr \
+ sw/source/uibase/shells/txtcrsr \
+ sw/source/uibase/shells/txtnum \
+ sw/source/uibase/sidebar/PageOrientationControl \
+ sw/source/uibase/sidebar/PageMarginControl \
+ sw/source/uibase/sidebar/PageSizeControl \
+ sw/source/uibase/sidebar/PageColumnControl \
+ sw/source/uibase/sidebar/PagePropertyPanel \
+ sw/source/uibase/sidebar/WrapPropertyPanel \
+ sw/source/uibase/sidebar/SwPanelFactory \
+ sw/source/uibase/smartmenu/stmenu \
+ sw/source/uibase/table/chartins \
+ sw/source/uibase/table/swtablerep \
+ sw/source/uibase/table/tablemgr \
+ sw/source/uibase/uiview/formatclipboard \
+ sw/source/uibase/uiview/pview \
+ sw/source/uibase/uiview/scroll \
+ sw/source/uibase/uiview/srcview \
+ sw/source/uibase/uiview/swcli \
+ sw/source/uibase/uiview/uivwimp \
+ sw/source/uibase/uiview/view \
+ sw/source/uibase/uiview/view0 \
+ sw/source/uibase/uiview/view1 \
+ sw/source/uibase/uiview/view2 \
+ sw/source/uibase/uiview/viewcoll \
+ sw/source/uibase/uiview/viewdlg \
+ sw/source/uibase/uiview/viewdlg2 \
+ sw/source/uibase/uiview/viewdraw \
+ sw/source/uibase/uiview/viewling \
+ sw/source/uibase/uiview/viewmdi \
+ sw/source/uibase/uiview/viewport \
+ sw/source/uibase/uiview/viewprt \
+ sw/source/uibase/uiview/viewsrch \
+ sw/source/uibase/uiview/viewstat \
+ sw/source/uibase/uiview/viewtab \
+ sw/source/uibase/uno/SwXDocumentSettings \
+ sw/source/uibase/uno/SwXFilterOptions \
+ sw/source/uibase/uno/dlelstnr \
+ sw/source/uibase/uno/unoatxt \
+ sw/source/uibase/uno/unodefaults \
+ sw/source/uibase/uno/unodispatch \
+ sw/source/uibase/uno/unodoc \
+ sw/source/uibase/uno/unofreg \
+ sw/source/uibase/uno/unomod \
+ sw/source/uibase/uno/unomodule \
+ sw/source/uibase/uno/unotxdoc \
+ sw/source/uibase/uno/unotxvw \
+ sw/source/uibase/utlui/attrdesc \
+ sw/source/uibase/utlui/bookctrl \
+ sw/source/uibase/utlui/condedit \
+ sw/source/uibase/utlui/content \
+ sw/source/uibase/utlui/glbltree \
+ sw/source/uibase/utlui/gloslst \
+ sw/source/uibase/utlui/initui \
+ sw/source/uibase/utlui/navicfg \
+ sw/source/uibase/utlui/navipi \
+ sw/source/uibase/utlui/numfmtlb \
+ sw/source/uibase/utlui/prcntfld \
+ sw/source/uibase/utlui/shdwcrsr \
+ sw/source/uibase/utlui/tmplctrl \
+ sw/source/uibase/utlui/uiitems \
+ sw/source/uibase/utlui/uitool \
+ sw/source/uibase/utlui/unotools \
+ sw/source/uibase/utlui/viewlayoutctrl \
+ sw/source/uibase/utlui/wordcountctrl \
+ sw/source/uibase/utlui/zoomctrl \
+ sw/source/uibase/web/wdocsh \
+ sw/source/uibase/web/wformsh \
+ sw/source/uibase/web/wfrmsh \
+ sw/source/uibase/web/wgrfsh \
+ sw/source/uibase/web/wlistsh \
+ sw/source/uibase/web/wolesh \
+ sw/source/uibase/web/wtabsh \
+ sw/source/uibase/web/wtextsh \
+ sw/source/uibase/web/wview \
+ sw/source/uibase/wrtsh/delete \
+ sw/source/uibase/wrtsh/move \
+ sw/source/uibase/wrtsh/navmgr \
+ sw/source/uibase/wrtsh/select \
+ sw/source/uibase/wrtsh/wrtsh1 \
+ sw/source/uibase/wrtsh/wrtsh2 \
+ sw/source/uibase/wrtsh/wrtsh3 \
+ sw/source/uibase/wrtsh/wrtsh4 \
+ sw/source/uibase/wrtsh/wrtundo \
))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Library_add_exception_objects,sw,\
- 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 \
- sw/source/core/uibase/uno/unomailmerge \
+ sw/source/uibase/dbui/dbmgr \
+ sw/source/uibase/dbui/dbtree \
+ sw/source/uibase/dbui/dbui \
+ sw/source/uibase/dbui/maildispatcher \
+ sw/source/uibase/dbui/mailmergechildwindow \
+ sw/source/uibase/dbui/mailmergehelper \
+ sw/source/uibase/dbui/mmconfigitem \
+ sw/source/uibase/dbui/swdbtoolsclient \
+ sw/source/uibase/uno/unomailmerge \
))
endif
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 19b7616..fe9e584 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,swui))
$(eval $(call gb_Library_set_include,swui,\
-I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/uibase/inc \
+ -I$(SRCDIR)/sw/source/uibase/inc \
-I$(WORKDIR)/SdiTarget/sw/sdi \
$$(INCLUDE) \
))
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index a85f7f0..fa8e8b2 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_componentfile,vbaswobj,sw/util/vbaswobj))
$(eval $(call gb_Library_set_precompiled_header,vbaswobj,$(SRCDIR)/sw/inc/pch/precompiled_vbaswobj))
$(eval $(call gb_Library_set_include,vbaswobj,\
- -I$(SRCDIR)/sw/source/core/uibase/inc \
+ -I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/inc \
$$(INCLUDE) \
))
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index f7c607c..2ed0084 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 <../uibase/inc/wrtsh.hxx>
-#include <../uibase/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 9e1667e..ff5bad3 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -93,7 +93,7 @@
#include <expfld.hxx>
#include <flddat.hxx>
#include <fldui.hrc>
-#include "../uibase/inc/fldmgr.hxx"
+#include "../../uibase/inc/fldmgr.hxx"
#include "fldbas.hxx" // SwField
using namespace ::com::sun::star;
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 416b347..03a1dd0 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -66,7 +66,7 @@
#include <anchoredobject.hxx>
#include <wrtsh.hxx>
-#include "../uibase/inc/view.hxx"
+#include "../../uibase/inc/view.hxx"
#include <PostItMgr.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/virdev.hxx>
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 92928e3..dca5f039 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -31,7 +31,7 @@
#include "envelp.hrc"
#include "dochdl.hrc"
#include <index.hrc>
-#include <../../core/uibase/dialog/regionsw.hrc>
+#include <../../uibase/dialog/regionsw.hrc>
#include <wordcountdialog.hxx>
#include "abstract.hxx"
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index ba690d6..a4cfbfb 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -54,7 +54,7 @@
#include <helpid.h>
#include <cmdid.h>
-#include <../../core/uibase/dialog/regionsw.hrc>
+#include <../../uibase/dialog/regionsw.hrc>
#include <comcore.hrc>
#include <globals.hrc>
#include <sfx2/bindings.hxx>
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 00ca91e..db98aa8 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -24,7 +24,7 @@
#include <swtypes.hxx>
#include <wrtsh.hxx>
#include <initui.hxx>
-#include <../../core/uibase/envelp/labimp.hxx>
+#include <../../uibase/envelp/labimp.hxx>
#include <labfmt.hxx>
#include <labprt.hxx>
#include <unotools.hxx>
@@ -33,7 +33,7 @@
#include <cmdid.h>
#include <helpid.h>
#include <globals.hrc>
-#include <../../core/uibase/envelp/label.hrc>
+#include <../../uibase/envelp/label.hrc>
//impl in envimg.cxx
extern SW_DLLPUBLIC OUString MakeSender();
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 2582e5b..ae27b71 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -26,12 +26,12 @@
#include "swtypes.hxx"
#include "cmdid.h"
#include "label.hxx"
-#include "../../core/uibase/envelp/labimp.hxx"
+#include "../../uibase/envelp/labimp.hxx"
#include "labimg.hxx"
#include "labfmt.hxx"
#include "uitool.hxx"
-#include "../../core/uibase/envelp/label.hrc"
+#include "../../uibase/envelp/label.hrc"
#include "labfmt.hrc"
#include <unomid.h>
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 9929768..b00f6fd 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -18,7 +18,8 @@
*/
#ifndef INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
#define INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
-#include "../../core/uibase/envelp/labimp.hxx"
+
+#include "../../uibase/envelp/labimp.hxx"
#include <com/sun/star/text/XAutoTextContainer2.hpp>
#include <vcl/layout.hxx>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 62a9bb6..f102f15 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -45,7 +45,7 @@
#include <uitool.hxx>
#include <frmatr.hxx>
#include <tabledlg.hxx>
-#include <../../core/uibase/table/tablepg.hxx>
+#include <../../uibase/table/tablepg.hxx>
#include <tablemgr.hxx>
#include <pagedesc.hxx>
#include <uiitems.hxx>
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index c718024..582c3b8 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -21,7 +21,7 @@
#include <globals.hrc>
#include <utlui.hrc>
-#include <../../core/uibase/utlui/unotools.hrc>
+#include <../../uibase/utlui/unotools.hrc>
#include <unoprnms.hxx>
#include <osl/diagnose.h>
#include <vcl/msgbox.hxx>
diff --git a/sw/source/core/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
similarity index 100%
rename from sw/source/core/uibase/app/appenv.cxx
rename to sw/source/uibase/app/appenv.cxx
diff --git a/sw/source/core/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
similarity index 100%
rename from sw/source/core/uibase/app/apphdl.cxx
rename to sw/source/uibase/app/apphdl.cxx
diff --git a/sw/source/core/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
similarity index 100%
rename from sw/source/core/uibase/app/applab.cxx
rename to sw/source/uibase/app/applab.cxx
diff --git a/sw/source/core/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
similarity index 100%
rename from sw/source/core/uibase/app/appopt.cxx
rename to sw/source/uibase/app/appopt.cxx
diff --git a/sw/source/core/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
similarity index 100%
rename from sw/source/core/uibase/app/docsh.cxx
rename to sw/source/uibase/app/docsh.cxx
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
similarity index 100%
rename from sw/source/core/uibase/app/docsh2.cxx
rename to sw/source/uibase/app/docsh2.cxx
diff --git a/sw/source/core/uibase/app/docshdrw.cxx b/sw/source/uibase/app/docshdrw.cxx
similarity index 100%
rename from sw/source/core/uibase/app/docshdrw.cxx
rename to sw/source/uibase/app/docshdrw.cxx
diff --git a/sw/source/core/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
similarity index 100%
rename from sw/source/core/uibase/app/docshini.cxx
rename to sw/source/uibase/app/docshini.cxx
diff --git a/sw/source/core/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
similarity index 100%
rename from sw/source/core/uibase/app/docst.cxx
rename to sw/source/uibase/app/docst.cxx
diff --git a/sw/source/core/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
similarity index 100%
rename from sw/source/core/uibase/app/docstyle.cxx
rename to sw/source/uibase/app/docstyle.cxx
diff --git a/sw/source/core/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx
similarity index 100%
rename from sw/source/core/uibase/app/mainwn.cxx
rename to sw/source/uibase/app/mainwn.cxx
diff --git a/sw/source/core/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
similarity index 100%
rename from sw/source/core/uibase/app/swdll.cxx
rename to sw/source/uibase/app/swdll.cxx
diff --git a/sw/source/core/uibase/app/swdllimpl.hxx b/sw/source/uibase/app/swdllimpl.hxx
similarity index 100%
rename from sw/source/core/uibase/app/swdllimpl.hxx
rename to sw/source/uibase/app/swdllimpl.hxx
diff --git a/sw/source/core/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
similarity index 100%
rename from sw/source/core/uibase/app/swmodul1.cxx
rename to sw/source/uibase/app/swmodul1.cxx
diff --git a/sw/source/core/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
similarity index 100%
rename from sw/source/core/uibase/app/swmodule.cxx
rename to sw/source/uibase/app/swmodule.cxx
diff --git a/sw/source/core/uibase/app/swwait.cxx b/sw/source/uibase/app/swwait.cxx
similarity index 100%
rename from sw/source/core/uibase/app/swwait.cxx
rename to sw/source/uibase/app/swwait.cxx
diff --git a/sw/source/core/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx
similarity index 100%
rename from sw/source/core/uibase/cctrl/actctrl.cxx
rename to sw/source/uibase/cctrl/actctrl.cxx
diff --git a/sw/source/core/uibase/cctrl/popbox.cxx b/sw/source/uibase/cctrl/popbox.cxx
similarity index 100%
rename from sw/source/core/uibase/cctrl/popbox.cxx
rename to sw/source/uibase/cctrl/popbox.cxx
diff --git a/sw/source/core/uibase/cctrl/swlbox.cxx b/sw/source/uibase/cctrl/swlbox.cxx
similarity index 100%
rename from sw/source/core/uibase/cctrl/swlbox.cxx
rename to sw/source/uibase/cctrl/swlbox.cxx
diff --git a/sw/source/core/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx
similarity index 100%
rename from sw/source/core/uibase/chrdlg/ccoll.cxx
rename to sw/source/uibase/chrdlg/ccoll.cxx
diff --git a/sw/source/core/uibase/config/barcfg.cxx b/sw/source/uibase/config/barcfg.cxx
similarity index 100%
rename from sw/source/core/uibase/config/barcfg.cxx
rename to sw/source/uibase/config/barcfg.cxx
diff --git a/sw/source/core/uibase/config/caption.cxx b/sw/source/uibase/config/caption.cxx
similarity index 100%
rename from sw/source/core/uibase/config/caption.cxx
rename to sw/source/uibase/config/caption.cxx
diff --git a/sw/source/core/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx
similarity index 100%
rename from sw/source/core/uibase/config/cfgitems.cxx
rename to sw/source/uibase/config/cfgitems.cxx
diff --git a/sw/source/core/uibase/config/dbconfig.cxx b/sw/source/uibase/config/dbconfig.cxx
similarity index 100%
rename from sw/source/core/uibase/config/dbconfig.cxx
rename to sw/source/uibase/config/dbconfig.cxx
diff --git a/sw/source/core/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx
similarity index 100%
rename from sw/source/core/uibase/config/fontcfg.cxx
rename to sw/source/uibase/config/fontcfg.cxx
diff --git a/sw/source/core/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
similarity index 100%
rename from sw/source/core/uibase/config/modcfg.cxx
rename to sw/source/uibase/config/modcfg.cxx
diff --git a/sw/source/core/uibase/config/prtopt.cxx b/sw/source/uibase/config/prtopt.cxx
similarity index 100%
rename from sw/source/core/uibase/config/prtopt.cxx
rename to sw/source/uibase/config/prtopt.cxx
diff --git a/sw/source/core/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx
similarity index 100%
rename from sw/source/core/uibase/config/uinums.cxx
rename to sw/source/uibase/config/uinums.cxx
diff --git a/sw/source/core/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
similarity index 100%
rename from sw/source/core/uibase/config/usrpref.cxx
rename to sw/source/uibase/config/usrpref.cxx
diff --git a/sw/source/core/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
similarity index 100%
rename from sw/source/core/uibase/config/viewopt.cxx
rename to sw/source/uibase/config/viewopt.cxx
diff --git a/sw/source/core/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
similarity index 100%
rename from sw/source/core/uibase/dbui/dbmgr.cxx
rename to sw/source/uibase/dbui/dbmgr.cxx
diff --git a/sw/source/core/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
similarity index 100%
rename from sw/source/core/uibase/dbui/dbtree.cxx
rename to sw/source/uibase/dbui/dbtree.cxx
diff --git a/sw/source/core/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx
similarity index 100%
rename from sw/source/core/uibase/dbui/dbui.cxx
rename to sw/source/uibase/dbui/dbui.cxx
diff --git a/sw/source/core/uibase/dbui/maildispatcher.cxx b/sw/source/uibase/dbui/maildispatcher.cxx
similarity index 100%
rename from sw/source/core/uibase/dbui/maildispatcher.cxx
rename to sw/source/uibase/dbui/maildispatcher.cxx
diff --git a/sw/source/core/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx
similarity index 99%
rename from sw/source/core/uibase/dbui/mailmergechildwindow.cxx
rename to sw/source/uibase/dbui/mailmergechildwindow.cxx
index f70074a..b92593a 100644
--- a/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx
@@ -27,7 +27,7 @@
#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
#include <mailmergechildwindow.hxx>
-#include <../../../ui/dbui/mmoutputpage.hxx>
+#include <../../ui/dbui/mmoutputpage.hxx>
#include <mmconfigitem.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
diff --git a/sw/source/core/uibase/dbui/mailmergechildwindow.hrc b/sw/source/uibase/dbui/mailmergechildwindow.hrc
similarity index 100%
rename from sw/source/core/uibase/dbui/mailmergechildwindow.hrc
rename to sw/source/uibase/dbui/mailmergechildwindow.hrc
diff --git a/sw/source/core/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src
similarity index 100%
rename from sw/source/core/uibase/dbui/mailmergechildwindow.src
rename to sw/source/uibase/dbui/mailmergechildwindow.src
diff --git a/sw/source/core/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
similarity index 100%
rename from sw/source/core/uibase/dbui/mailmergehelper.cxx
rename to sw/source/uibase/dbui/mailmergehelper.cxx
diff --git a/sw/source/core/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
similarity index 100%
rename from sw/source/core/uibase/dbui/mmconfigitem.cxx
rename to sw/source/uibase/dbui/mmconfigitem.cxx
diff --git a/sw/source/core/uibase/dbui/swdbtoolsclient.cxx b/sw/source/uibase/dbui/swdbtoolsclient.cxx
similarity index 100%
rename from sw/source/core/uibase/dbui/swdbtoolsclient.cxx
rename to sw/source/uibase/dbui/swdbtoolsclient.cxx
diff --git a/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
similarity index 100%
rename from sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
rename to sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
diff --git a/sw/source/core/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
similarity index 100%
rename from sw/source/core/uibase/dialog/regionsw.cxx
rename to sw/source/uibase/dialog/regionsw.cxx
diff --git a/sw/source/core/uibase/dialog/regionsw.hrc b/sw/source/uibase/dialog/regionsw.hrc
similarity index 100%
rename from sw/source/core/uibase/dialog/regionsw.hrc
rename to sw/source/uibase/dialog/regionsw.hrc
diff --git a/sw/source/core/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src
similarity index 100%
rename from sw/source/core/uibase/dialog/regionsw.src
rename to sw/source/uibase/dialog/regionsw.src
diff --git a/sw/source/core/uibase/dialog/swabstdlg.cxx b/sw/source/uibase/dialog/swabstdlg.cxx
similarity index 100%
rename from sw/source/core/uibase/dialog/swabstdlg.cxx
rename to sw/source/uibase/dialog/swabstdlg.cxx
diff --git a/sw/source/core/uibase/dialog/swwrtshitem.cxx b/sw/source/uibase/dialog/swwrtshitem.cxx
similarity index 100%
rename from sw/source/core/uibase/dialog/swwrtshitem.cxx
rename to sw/source/uibase/dialog/swwrtshitem.cxx
diff --git a/sw/source/core/uibase/dialog/wordcountwrapper.cxx b/sw/source/uibase/dialog/wordcountwrapper.cxx
similarity index 100%
rename from sw/source/core/uibase/dialog/wordcountwrapper.cxx
rename to sw/source/uibase/dialog/wordcountwrapper.cxx
diff --git a/sw/source/core/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
similarity index 100%
rename from sw/source/core/uibase/dochdl/gloshdl.cxx
rename to sw/source/uibase/dochdl/gloshdl.cxx
diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
similarity index 100%
rename from sw/source/core/uibase/dochdl/swdtflvr.cxx
rename to sw/source/uibase/dochdl/swdtflvr.cxx
diff --git a/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/AnchorOverlayObject.cxx
rename to sw/source/uibase/docvw/AnchorOverlayObject.cxx
diff --git a/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
similarity index 100%
rename from sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
rename to sw/source/uibase/docvw/AnchorOverlayObject.hxx
diff --git a/sw/source/core/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/AnnotationMenuButton.cxx
rename to sw/source/uibase/docvw/AnnotationMenuButton.cxx
diff --git a/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
similarity index 100%
rename from sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
rename to sw/source/uibase/docvw/AnnotationMenuButton.hxx
diff --git a/sw/source/core/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/AnnotationWin.cxx
rename to sw/source/uibase/docvw/AnnotationWin.cxx
diff --git a/sw/source/core/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/DashedLine.cxx
rename to sw/source/uibase/docvw/DashedLine.cxx
diff --git a/sw/source/core/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/FrameControlsManager.cxx
rename to sw/source/uibase/docvw/FrameControlsManager.cxx
diff --git a/sw/source/core/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/HeaderFooterWin.cxx
rename to sw/source/uibase/docvw/HeaderFooterWin.cxx
diff --git a/sw/source/core/uibase/docvw/OverlayRanges.cxx b/sw/source/uibase/docvw/OverlayRanges.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/OverlayRanges.cxx
rename to sw/source/uibase/docvw/OverlayRanges.cxx
diff --git a/sw/source/core/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx
similarity index 100%
rename from sw/source/core/uibase/docvw/OverlayRanges.hxx
rename to sw/source/uibase/docvw/OverlayRanges.hxx
diff --git a/sw/source/core/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/PageBreakWin.cxx
rename to sw/source/uibase/docvw/PageBreakWin.cxx
diff --git a/sw/source/core/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/PostItMgr.cxx
rename to sw/source/uibase/docvw/PostItMgr.cxx
diff --git a/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/ShadowOverlayObject.cxx
rename to sw/source/uibase/docvw/ShadowOverlayObject.cxx
diff --git a/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
similarity index 100%
rename from sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
rename to sw/source/uibase/docvw/ShadowOverlayObject.hxx
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/SidebarTxtControl.cxx
rename to sw/source/uibase/docvw/SidebarTxtControl.cxx
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
similarity index 100%
rename from sw/source/core/uibase/docvw/SidebarTxtControl.hxx
rename to sw/source/uibase/docvw/SidebarTxtControl.hxx
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
rename to sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
similarity index 100%
rename from sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
rename to sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
diff --git a/sw/source/core/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/SidebarWin.cxx
rename to sw/source/uibase/docvw/SidebarWin.cxx
diff --git a/sw/source/core/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/SidebarWinAcc.cxx
rename to sw/source/uibase/docvw/SidebarWinAcc.cxx
diff --git a/sw/source/core/uibase/docvw/SidebarWinAcc.hxx b/sw/source/uibase/docvw/SidebarWinAcc.hxx
similarity index 100%
rename from sw/source/core/uibase/docvw/SidebarWinAcc.hxx
rename to sw/source/uibase/docvw/SidebarWinAcc.hxx
diff --git a/sw/source/core/uibase/docvw/annotation.hrc b/sw/source/uibase/docvw/annotation.hrc
similarity index 100%
rename from sw/source/core/uibase/docvw/annotation.hrc
rename to sw/source/uibase/docvw/annotation.hrc
diff --git a/sw/source/core/uibase/docvw/docvw.hrc b/sw/source/uibase/docvw/docvw.hrc
similarity index 100%
rename from sw/source/core/uibase/docvw/docvw.hrc
rename to sw/source/uibase/docvw/docvw.hrc
diff --git a/sw/source/core/uibase/docvw/docvw.src b/sw/source/uibase/docvw/docvw.src
similarity index 100%
rename from sw/source/core/uibase/docvw/docvw.src
rename to sw/source/uibase/docvw/docvw.src
diff --git a/sw/source/core/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/edtdd.cxx
rename to sw/source/uibase/docvw/edtdd.cxx
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
similarity index 99%
rename from sw/source/core/uibase/docvw/edtwin.cxx
rename to sw/source/uibase/docvw/edtwin.cxx
index 43ab6d6..5b96f79 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -178,7 +178,7 @@ long SwEditWin::m_nDDStartPosX = 0;
* (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
* The initial color used by the button is set in /core/svx/source/tbxcntrls/tbcontrl.cxx
* (SvxColorToolBoxControl::SvxColorToolBoxControl())
- * and in case of writer for text(background)color also in /core/sw/source/core/uibase/docvw/edtwin.cxx
+ * and in case of writer for text(background)color also in /core/sw/source/uibase/docvw/edtwin.cxx
* (SwEditWin::m_aTextBackColor and SwEditWin::m_aTextColor)
*/
Color SwEditWin::m_aTextBackColor(COL_YELLOW);
diff --git a/sw/source/core/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/edtwin2.cxx
rename to sw/source/uibase/docvw/edtwin2.cxx
diff --git a/sw/source/core/uibase/docvw/edtwin3.cxx b/sw/source/uibase/docvw/edtwin3.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/edtwin3.cxx
rename to sw/source/uibase/docvw/edtwin3.cxx
diff --git a/sw/source/core/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/frmsidebarwincontainer.cxx
rename to sw/source/uibase/docvw/frmsidebarwincontainer.cxx
diff --git a/sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
similarity index 100%
rename from sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx
rename to sw/source/uibase/docvw/frmsidebarwincontainer.hxx
diff --git a/sw/source/core/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/romenu.cxx
rename to sw/source/uibase/docvw/romenu.cxx
diff --git a/sw/source/core/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
similarity index 100%
rename from sw/source/core/uibase/docvw/romenu.hxx
rename to sw/source/uibase/docvw/romenu.hxx
diff --git a/sw/source/core/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
similarity index 100%
rename from sw/source/core/uibase/docvw/srcedtw.cxx
rename to sw/source/uibase/docvw/srcedtw.cxx
diff --git a/sw/source/core/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
similarity index 100%
rename from sw/source/core/uibase/envelp/envimg.cxx
rename to sw/source/uibase/envelp/envimg.cxx
diff --git a/sw/source/core/uibase/envelp/label.hrc b/sw/source/uibase/envelp/label.hrc
similarity index 100%
rename from sw/source/core/uibase/envelp/label.hrc
rename to sw/source/uibase/envelp/label.hrc
diff --git a/sw/source/core/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx
similarity index 100%
rename from sw/source/core/uibase/envelp/labelcfg.cxx
rename to sw/source/uibase/envelp/labelcfg.cxx
diff --git a/sw/source/core/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
similarity index 100%
rename from sw/source/core/uibase/envelp/labimg.cxx
rename to sw/source/uibase/envelp/labimg.cxx
diff --git a/sw/source/core/uibase/envelp/labimp.hxx b/sw/source/uibase/envelp/labimp.hxx
similarity index 100%
rename from sw/source/core/uibase/envelp/labimp.hxx
rename to sw/source/uibase/envelp/labimp.hxx
diff --git a/sw/source/core/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx
similarity index 100%
rename from sw/source/core/uibase/envelp/syncbtn.cxx
rename to sw/source/uibase/envelp/syncbtn.cxx
diff --git a/sw/source/core/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
similarity index 100%
rename from sw/source/core/uibase/fldui/fldmgr.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list