From 35029b250318b3a4f02cef5194abdd3f68311c43 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 26 May 2014 17:43:14 +0200 Subject: 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 --- sw/Library_sw.mk | 420 +++++++++++++++++++++++++++---------------------------- 1 file changed, 210 insertions(+), 210 deletions(-) (limited to 'sw/Library_sw.mk') diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index b84e9fc0f5d4..c9fe775f57cf 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 -- cgit