d02f75a8c3
(cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5) Conflicts: chart2/source/controller/dialogs/dlg_View3D.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx chart2/source/controller/drawinglayer/ViewElementListProvider.cxx chart2/source/controller/inc/ViewElementListProvider.hxx chart2/source/controller/inc/dlg_View3D.hxx chart2/source/controller/main/ShapeController.cxx chart2/source/inc/chartview/DrawModelWrapper.hxx chart2/source/view/main/DrawModelWrapper.cxx cui/source/inc/border.hxx cui/source/inc/cuitabarea.hxx cui/source/inc/cuitabline.hxx cui/source/inc/sdrcelldlg.hxx cui/source/inc/treeopt.hxx cui/source/options/optchart.cxx cui/source/options/optchart.hxx cui/source/options/optcolor.cxx cui/source/options/treeopt.cxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/border.cxx cui/source/tabpages/chardlg.cxx cui/source/tabpages/numpages.cxx cui/source/tabpages/tpcolor.cxx cui/source/tabpages/tplneend.cxx editeng/inc/editeng/outliner.hxx extensions/source/propctrlr/standardcontrol.cxx framework/source/register/registerservices.cxx offapi/com/sun/star/ui/makefile.mk officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/makefile.mk officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk postprocess/packregistry/makefile.mk reportdesign/source/ui/dlg/Condition.cxx reportdesign/source/ui/misc/UITools.cxx sc/inc/document.hxx sc/inc/helpids.h sc/inc/sc.hrc sc/prj/build.lst sc/sdi/scalc.sdi sc/source/core/data/documen9.cxx sc/source/core/data/drwlayer.cxx sc/source/ui/app/scdll.cxx sc/source/ui/app/typemap.cxx sc/source/ui/dbgui/scendlg.cxx sc/source/ui/docshell/docsh2.cxx sc/source/ui/docshell/docsh4.cxx sc/source/ui/drawfunc/chartsh.cxx sc/source/ui/drawfunc/drawsh.cxx sc/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh4.cxx sc/source/ui/drawfunc/drformsh.cxx sc/source/ui/drawfunc/drtxtob.cxx sc/source/ui/drawfunc/drtxtob1.cxx sc/source/ui/drawfunc/drtxtob2.cxx sc/source/ui/drawfunc/graphsh.cxx sc/source/ui/drawfunc/oleobjsh.cxx sc/source/ui/inc/chartsh.hxx sc/source/ui/inc/formatsh.hxx sc/source/ui/miscdlgs/tabbgcolordlg.cxx sc/source/ui/navipi/navipi.cxx sc/source/ui/optdlg/opredlin.cxx sc/source/ui/optdlg/tpview.cxx sc/source/ui/sidebar/makefile.mk sc/source/ui/view/auditsh.cxx sc/source/ui/view/cellsh.cxx sc/source/ui/view/editsh.cxx sc/source/ui/view/formatsh.cxx sc/source/ui/view/pivotsh.cxx sc/source/ui/view/tabvwsh.cxx sc/util/makefile.mk sd/inc/sdabstdlg.hxx sd/prj/build.lst sd/sdi/ToolPanelViewShell.sdi sd/sdi/makefile.mk sd/source/ui/accessibility/makefile.mk sd/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/dlg/PaneChildWindows.cxx sd/source/ui/dlg/PaneShells.cxx sd/source/ui/dlg/copydlg.cxx sd/source/ui/dlg/navigatr.cxx sd/source/ui/dlg/sddlgfact.cxx sd/source/ui/dlg/sddlgfact.hxx sd/source/ui/docshell/docshel3.cxx sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx sd/source/ui/framework/factories/TaskPanelFactory.cxx sd/source/ui/framework/factories/TaskPanelFactory.hxx sd/source/ui/framework/factories/ViewShellWrapper.cxx sd/source/ui/framework/factories/makefile.mk sd/source/ui/framework/module/ImpressModule.cxx sd/source/ui/framework/module/ToolPanelModule.cxx sd/source/ui/framework/tools/FrameworkHelper.cxx sd/source/ui/func/fuolbull.cxx sd/source/ui/inc/DrawViewShell.hxx sd/source/ui/inc/PaneChildWindows.hxx sd/source/ui/inc/celltempl.hxx sd/source/ui/inc/copydlg.hxx sd/source/ui/inc/dlgpage.hxx sd/source/ui/inc/framework/FrameworkHelper.hxx sd/source/ui/inc/prltempl.hxx sd/source/ui/inc/tabtempl.hxx sd/source/ui/inc/taskpane/ILayoutableWindow.hxx sd/source/ui/inc/taskpane/PanelId.hxx sd/source/ui/inc/tpaction.hxx sd/source/ui/sidebar/AllMasterPagesSelector.cxx sd/source/ui/sidebar/AllMasterPagesSelector.hxx sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx sd/source/ui/sidebar/DocumentHelper.cxx sd/source/ui/sidebar/DocumentHelper.hxx sd/source/ui/sidebar/LayoutMenu.cxx sd/source/ui/sidebar/LayoutMenu.hxx sd/source/ui/sidebar/MasterPageContainer.cxx sd/source/ui/sidebar/MasterPageContainer.hxx sd/source/ui/sidebar/MasterPageContainerFiller.cxx sd/source/ui/sidebar/MasterPageContainerFiller.hxx sd/source/ui/sidebar/MasterPageContainerProviders.cxx sd/source/ui/sidebar/MasterPageContainerProviders.hxx sd/source/ui/sidebar/MasterPageContainerQueue.cxx sd/source/ui/sidebar/MasterPageContainerQueue.hxx sd/source/ui/sidebar/MasterPageDescriptor.cxx sd/source/ui/sidebar/MasterPageDescriptor.hxx sd/source/ui/sidebar/MasterPageObserver.cxx sd/source/ui/sidebar/MasterPagesSelector.cxx sd/source/ui/sidebar/MasterPagesSelector.hxx sd/source/ui/sidebar/PreviewValueSet.cxx sd/source/ui/sidebar/PreviewValueSet.hxx sd/source/ui/sidebar/RecentMasterPagesSelector.cxx sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx sd/source/ui/sidebar/SidebarShellManager.cxx sd/source/ui/sidebar/SlideTransitionPanel.hxx sd/source/ui/sidebar/makefile.mk sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx sd/source/ui/table/TableDesignPane.hxx sd/source/ui/toolpanel/ControlContainer.cxx sd/source/ui/toolpanel/ControlContainerDescriptor.hxx sd/source/ui/toolpanel/MethodGuard.hxx sd/source/ui/toolpanel/ScrollPanel.cxx sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx sd/source/ui/toolpanel/SubToolPanel.cxx sd/source/ui/toolpanel/TaskPaneFocusManager.cxx sd/source/ui/toolpanel/TaskPaneTreeNode.cxx sd/source/ui/toolpanel/TitleBar.cxx sd/source/ui/toolpanel/TitledControl.cxx sd/source/ui/toolpanel/ToolPanel.cxx sd/source/ui/toolpanel/ToolPanel.hxx sd/source/ui/toolpanel/ToolPanelFactory.cxx sd/source/ui/toolpanel/ToolPanelUIElement.cxx sd/source/ui/toolpanel/ToolPanelUIElement.hxx sd/source/ui/toolpanel/ToolPanelViewShell.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx sd/source/ui/toolpanel/controls/TableDesignPanel.cxx sd/source/ui/toolpanel/controls/TableDesignPanel.hxx sd/source/ui/unoidl/UnoDocumentSettings.cxx sd/source/ui/view/ViewShellBase.cxx sd/source/ui/view/drtxtob.cxx sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews7.cxx sd/source/ui/view/drviewsa.cxx sd/source/ui/view/drviewsf.cxx sd/source/ui/view/outlnvsh.cxx sd/source/ui/view/sdview.cxx sd/source/ui/view/viewshel.cxx sd/uiconfig/sdraw/menubar/menubar.xml sd/util/makefile.mk sfx2/Package_inc.mk sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxsids.hrc sfx2/source/control/bindings.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/inc/templdgi.hxx svx/AllLangResTarget_svx.mk svx/Package_inc.mk svx/inc/svx/XPropertyTable.hxx svx/inc/svx/bmpmask.hxx svx/inc/svx/colrctrl.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/dlgctrl.hxx svx/inc/svx/dlgutil.hxx svx/inc/svx/drawitem.hxx svx/inc/svx/fontwork.hxx svx/inc/svx/galbrws.hxx svx/inc/svx/sdr/table/tablecontroller.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdstr.hrc svx/inc/svx/svxids.hrc svx/inc/svx/svxitems.hrc svx/inc/svx/xattr.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xit.hxx svx/inc/svx/xlineit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xtable.hxx svx/sdi/svx.sdi svx/source/dialog/_bmpmask.cxx svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/dlgutil.cxx svx/source/dialog/fontwork.cxx svx/source/gallery2/galbrws.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/gallery1.cxx svx/source/items/drawitem.cxx svx/source/items/svxitems.src svx/source/sdr/attribute/sdrformtextattribute.cxx svx/source/sidebar/ColorPanel.hxx svx/source/sidebar/EmptyPanel.hrc svx/source/sidebar/EmptyPanel.hxx svx/source/sidebar/gallery/GalleryPanel.hxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdstr.src svx/source/tbxctrls/tbcontrl.cxx svx/source/unodraw/XPropertyTable.cxx svx/source/unodraw/unoctabl.cxx svx/source/xoutdev/XPropertyEntry.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xtabbtmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/source/xoutdev/xtabdash.cxx svx/source/xoutdev/xtabgrdt.cxx svx/source/xoutdev/xtabhtch.cxx svx/source/xoutdev/xtable.cxx svx/source/xoutdev/xtablend.cxx svx/util/svx.component sw/inc/cmdid.h sw/inc/docsh.hxx sw/inc/editsh.hxx sw/inc/helpid.h sw/inc/rcid.hrc sw/inc/swabstdlg.hxx sw/inc/swcommands.h sw/sdi/swriter.sdi sw/source/core/doc/docdesc.cxx sw/source/core/draw/drawdoc.cxx sw/source/ui/app/docsh2.cxx sw/source/ui/app/docshdrw.cxx sw/source/ui/app/docshini.cxx sw/source/ui/app/docst.cxx sw/source/ui/config/optpage.cxx sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.hxx sw/source/ui/fmtui/tmpdlg.cxx sw/source/ui/inc/tmpdlg.hxx sw/source/ui/misc/pggrid.cxx sw/source/ui/shells/annotsh.cxx sw/source/ui/shells/basesh.cxx sw/source/ui/shells/beziersh.cxx sw/source/ui/shells/drawdlg.cxx sw/source/ui/shells/drawsh.cxx sw/source/ui/shells/drformsh.cxx sw/source/ui/shells/drwbassh.cxx sw/source/ui/shells/drwtxtex.cxx sw/source/ui/shells/drwtxtsh.cxx sw/source/ui/shells/frmsh.cxx sw/source/ui/shells/grfsh.cxx sw/source/ui/shells/olesh.cxx sw/source/ui/shells/tabsh.cxx sw/source/ui/shells/textsh.cxx sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/txtnum.cxx sw/source/ui/uiview/viewtab.cxx sw/source/ui/uno/unofreg.cxx sw/source/ui/utlui/navipi.cxx sw/util/sw.component vcl/inc/vcl/split.hxx vcl/inc/vcl/window.hxx vcl/inc/window.h vcl/source/window/split.cxx vcl/source/window/window.cxx vcl/source/window/window4.cxx Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e Resolves: #i122194# Adapted license text in propertypanel.hrc then renamed it to ResourceDefinitions.hrc (cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b) Conflicts: sfx2/Package_inc.mk sfx2/source/sidebar/SidebarChildWindow.cxx svx/source/sidebar/graphic/GraphicPropertyPanel.cxx svx/source/sidebar/line/LinePropertyPanel.cxx svx/source/sidebar/possize/PosSizePropertyPanel.cxx sw/source/ui/sidebar/PagePropertyPanel.src sw/source/ui/sidebar/WrapPropertyPanel.src Change-Id: Ie009056a78ab108556717a501399c83b477b3548 Resolves: #i122194# finally I got the correct file name Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a More merge changes for optional sidebar: revert toolpanel removal, restore and re-enable task pane remove apparently un-used SidebarFactory module add extra visibility annotation to ItemReceiverUpdate
155 lines
5.6 KiB
Makefile
155 lines
5.6 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
# This file incorporates work covered by the following license notice:
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed
|
|
# with this work for additional information regarding copyright
|
|
# ownership. The ASF licenses this file to you under the Apache
|
|
# License, Version 2.0 (the "License"); you may not use this file
|
|
# except in compliance with the License. You may obtain a copy of
|
|
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
#
|
|
|
|
$(eval $(call gb_AllLangResTarget_AllLangResTarget,sw))
|
|
|
|
$(eval $(call gb_AllLangResTarget_add_srs,sw,\
|
|
sw/res \
|
|
))
|
|
|
|
$(eval $(call gb_SrsTarget_SrsTarget,sw/res))
|
|
|
|
$(eval $(call gb_SrsTarget_use_packages,sw/res,\
|
|
svx_globlmn_hrc \
|
|
))
|
|
|
|
$(eval $(call gb_SrsTarget_set_include,sw/res,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/sw/inc \
|
|
-I$(SRCDIR)/sw/source/core/inc \
|
|
-I$(SRCDIR)/sw/source/core/undo \
|
|
-I$(SRCDIR)/sw/source/core/unocore \
|
|
-I$(SRCDIR)/sw/source/ui/chrdlg \
|
|
-I$(SRCDIR)/sw/source/ui/config \
|
|
-I$(SRCDIR)/sw/source/ui/dbui \
|
|
-I$(SRCDIR)/sw/source/ui/dialog \
|
|
-I$(SRCDIR)/sw/source/ui/docvw \
|
|
-I$(SRCDIR)/sw/source/ui/envelp \
|
|
-I$(SRCDIR)/sw/source/ui/fldui \
|
|
-I$(SRCDIR)/sw/source/ui/fmtui \
|
|
-I$(SRCDIR)/sw/source/ui/frmdlg \
|
|
-I$(SRCDIR)/sw/source/ui/globdoc \
|
|
-I$(SRCDIR)/sw/source/ui/inc \
|
|
-I$(SRCDIR)/sw/source/ui/index \
|
|
-I$(SRCDIR)/sw/source/ui/lingu \
|
|
-I$(SRCDIR)/sw/source/ui/misc \
|
|
-I$(SRCDIR)/sw/source/ui/ribbar \
|
|
-I$(SRCDIR)/sw/source/ui/shells \
|
|
-I$(SRCDIR)/sw/source/ui/smartmenu \
|
|
-I$(SRCDIR)/sw/source/ui/table \
|
|
-I$(SRCDIR)/sw/source/ui/uiview \
|
|
-I$(SRCDIR)/sw/source/ui/utlui \
|
|
-I$(SRCDIR)/sw/source/ui/web \
|
|
-I$(SRCDIR)/sw/source/ui/wrtsh \
|
|
))
|
|
|
|
$(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/ui/app/app.src \
|
|
sw/source/ui/app/error.src \
|
|
sw/source/ui/app/mn.src \
|
|
sw/source/ui/chrdlg/ccoll.src \
|
|
sw/source/ui/chrdlg/chardlg.src \
|
|
sw/source/ui/chrdlg/chrdlg.src \
|
|
sw/source/ui/chrdlg/drpcps.src \
|
|
sw/source/ui/chrdlg/paradlg.src \
|
|
sw/source/ui/config/mailconfigpage.src \
|
|
sw/source/ui/config/optcomp.src \
|
|
sw/source/ui/config/optdlg.src \
|
|
sw/source/ui/config/optload.src \
|
|
sw/source/ui/config/redlopt.src \
|
|
sw/source/ui/dbui/addresslistdialog.src \
|
|
sw/source/ui/dbui/createaddresslistdialog.src \
|
|
sw/source/ui/dbui/customizeaddresslistdialog.src \
|
|
sw/source/ui/dbui/dbinsdlg.src \
|
|
sw/source/ui/dbui/dbtablepreviewdialog.src \
|
|
sw/source/ui/dbui/dbui.src \
|
|
sw/source/ui/dbui/mailmergechildwindow.src \
|
|
sw/source/ui/dbui/mailmergewizard.src \
|
|
sw/source/ui/dbui/mmaddressblockpage.src \
|
|
sw/source/ui/dbui/mmdocselectpage.src \
|
|
sw/source/ui/dbui/mmgreetingspage.src \
|
|
sw/source/ui/dbui/mmlayoutpage.src \
|
|
sw/source/ui/dbui/mmmergepage.src \
|
|
sw/source/ui/dbui/mmoutputpage.src \
|
|
sw/source/ui/dbui/mmoutputtypepage.src \
|
|
sw/source/ui/dbui/mmpreparemergepage.src \
|
|
sw/source/ui/dbui/selectdbtabledialog.src \
|
|
sw/source/ui/dialog/dialog.src \
|
|
sw/source/ui/dialog/regionsw.src \
|
|
sw/source/ui/dochdl/dochdl.src \
|
|
sw/source/ui/dochdl/selglos.src \
|
|
sw/source/ui/docvw/annotation.src \
|
|
sw/source/ui/docvw/access.src \
|
|
sw/source/ui/docvw/docvw.src \
|
|
sw/source/ui/envelp/envelp.src \
|
|
sw/source/ui/envelp/envfmt.src \
|
|
sw/source/ui/envelp/envlop.src \
|
|
sw/source/ui/envelp/envprt.src \
|
|
sw/source/ui/envelp/label.src \
|
|
sw/source/ui/envelp/labfmt.src \
|
|
sw/source/ui/envelp/labprt.src \
|
|
sw/source/ui/envelp/mailmrge.src \
|
|
sw/source/ui/fldui/flddb.src \
|
|
sw/source/ui/fldui/flddinf.src \
|
|
sw/source/ui/fldui/flddok.src \
|
|
sw/source/ui/fldui/fldfunc.src \
|
|
sw/source/ui/fldui/fldref.src \
|
|
sw/source/ui/fldui/fldtdlg.src \
|
|
sw/source/ui/fldui/fldui.src \
|
|
sw/source/ui/fldui/fldvar.src \
|
|
sw/source/ui/fmtui/tmpdlg.src \
|
|
sw/source/ui/frmdlg/frmpage.src \
|
|
sw/source/ui/frmdlg/frmui.src \
|
|
sw/source/ui/frmdlg/wrap.src \
|
|
sw/source/ui/globdoc/globdoc.src \
|
|
sw/source/ui/index/cnttab.src \
|
|
sw/source/ui/index/idxmrk.src \
|
|
sw/source/ui/index/multmrk.src \
|
|
sw/source/ui/lingu/olmenu.src \
|
|
sw/source/ui/misc/docfnote.src \
|
|
sw/source/ui/misc/glossary.src \
|
|
sw/source/ui/misc/numberingtypelistbox.src \
|
|
sw/source/ui/misc/redlndlg.src \
|
|
sw/source/ui/misc/srtdlg.src \
|
|
sw/source/ui/misc/swruler.src \
|
|
sw/source/ui/ribbar/inputwin.src \
|
|
sw/source/ui/ribbar/tbxanchr.src \
|
|
sw/source/ui/ribbar/workctrl.src \
|
|
sw/source/ui/shells/shells.src \
|
|
sw/source/ui/sidebar/PagePropertyPanel.src \
|
|
sw/source/ui/sidebar/WrapPropertyPanel.src \
|
|
sw/source/ui/smartmenu/stmenu.src \
|
|
sw/source/ui/table/table.src \
|
|
sw/source/ui/table/tabledlg.src \
|
|
sw/source/ui/uiview/view.src \
|
|
sw/source/ui/utlui/attrdesc.src \
|
|
sw/source/ui/utlui/gloslst.src \
|
|
sw/source/ui/utlui/initui.src \
|
|
sw/source/ui/utlui/navipi.src \
|
|
sw/source/ui/utlui/poolfmt.src \
|
|
sw/source/ui/utlui/unotools.src \
|
|
sw/source/ui/utlui/utlui.src \
|
|
sw/source/ui/web/web.src \
|
|
sw/source/ui/wrtsh/wrtsh.src \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|