-Extend ViewDataSupplier to work with window state for supported applications like sw, sc, sd -Extend sm DocumentPropertySupplier to work with window state -Add OldWindowState string member to SfxViewShell inherited classes for sw, sc and sd -Add OldWindowState string member to SmDocShell class for sm Imported window state is stored in the model shells or the ViewShells if available. This data is accessed by services like ViewDataSupplier and DocumentPropertySupplier used by persistentwindowstate.cxx. It is needed to store the window state data since frame is not available to get to resize and reposition by the time importing document has finished. -Add windowstatehelper header and source files in the framework module for getting/exporting the size and position of windows. Also add associated file and library to make files for exporting/using these helper methods across different modules. -Modify impl_searchRecycleTarget method in loadenv.cxx New frames are created for saved documents when launched from the start center. This is to apply their own window state separately from the backing window. New docs and templates still recycle the backing window frame. -Make the backing window close afterwards after the new frame has been created and the document gets loaded successfully (modified in loadenv.cxx) Change-Id: Ia5ad606e744621f267dae6cd468b0c430b2ebf1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185189 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins
249 lines
11 KiB
Makefile
249 lines
11 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_Library_Library,fwk))
|
|
|
|
$(eval $(call gb_Library_add_defs,fwk,\
|
|
-DFWK_DLLIMPLEMENTATION \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk,services))
|
|
|
|
$(eval $(call gb_Library_set_include,fwk,\
|
|
-I$(SRCDIR)/framework/source/inc \
|
|
-I$(SRCDIR)/framework/inc \
|
|
-I$(WORKDIR)/CustomTarget/officecfg/registry \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_precompiled_header,fwk,framework/inc/pch/precompiled_fwk))
|
|
|
|
$(eval $(call gb_Library_use_external,fwk,boost_headers))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,fwk,\
|
|
officecfg/registry \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,fwk))
|
|
|
|
$(eval $(call gb_Library_use_libraries,fwk,\
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
$(call gb_Helper_optional,BREAKPAD, \
|
|
crashreport) \
|
|
i18nlangtag \
|
|
sal \
|
|
salhelper \
|
|
sot \
|
|
svl \
|
|
svt \
|
|
tk \
|
|
tl \
|
|
ucbhelper \
|
|
utl \
|
|
vcl \
|
|
))
|
|
|
|
ifneq ($(ENABLE_WASM_STRIP_RECOVERYUI),TRUE)
|
|
$(eval $(call gb_Library_add_exception_objects,fwk,\
|
|
framework/source/services/autorecovery \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_componentimpl,fwk,autorecovery))
|
|
endif
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,fwk,\
|
|
framework/source/accelerators/acceleratorcache \
|
|
framework/source/accelerators/acceleratorconfiguration \
|
|
framework/source/accelerators/documentacceleratorconfiguration \
|
|
framework/source/accelerators/globalacceleratorconfiguration \
|
|
framework/source/accelerators/keymapping \
|
|
framework/source/accelerators/moduleacceleratorconfiguration \
|
|
framework/source/accelerators/presethandler \
|
|
framework/source/accelerators/storageholder \
|
|
framework/source/classes/framecontainer \
|
|
framework/source/classes/taskcreator \
|
|
framework/source/dispatch/closedispatcher \
|
|
framework/source/dispatch/dispatchinformationprovider \
|
|
framework/source/dispatch/dispatchprovider \
|
|
framework/source/dispatch/interceptionhelper \
|
|
framework/source/dispatch/loaddispatcher \
|
|
framework/source/dispatch/startmoduledispatcher \
|
|
framework/source/dispatch/windowcommanddispatch \
|
|
framework/source/dispatch/dispatchdisabler \
|
|
framework/source/dispatch/mailtodispatcher \
|
|
framework/source/dispatch/oxt_handler \
|
|
framework/source/dispatch/popupmenudispatcher \
|
|
framework/source/dispatch/servicehandler \
|
|
framework/source/dispatch/systemexec \
|
|
framework/source/helper/dockingareadefaultacceptor \
|
|
framework/source/helper/ocomponentaccess \
|
|
framework/source/helper/ocomponentenumeration \
|
|
framework/source/helper/oframes \
|
|
framework/source/helper/persistentwindowstate \
|
|
framework/source/helper/statusindicator \
|
|
framework/source/helper/statusindicatorfactory \
|
|
framework/source/helper/tagwindowasmodified \
|
|
framework/source/helper/titlebarupdate \
|
|
framework/source/helper/uiconfigelementwrapperbase \
|
|
framework/source/helper/uielementwrapperbase \
|
|
framework/source/helper/vclstatusindicator \
|
|
framework/source/helper/wakeupthread \
|
|
framework/source/interaction/quietinteraction \
|
|
framework/source/jobs/helponstartup \
|
|
framework/source/jobs/shelljob \
|
|
framework/source/fwe/classes/actiontriggercontainer \
|
|
framework/source/fwe/classes/actiontriggerpropertyset \
|
|
framework/source/fwe/classes/actiontriggerseparatorpropertyset \
|
|
framework/source/fwe/classes/addonmenu \
|
|
framework/source/fwe/classes/addonsoptions \
|
|
framework/source/fwe/classes/framelistanalyzer \
|
|
framework/source/fwe/classes/fwkresid \
|
|
framework/source/fwe/classes/rootactiontriggercontainer \
|
|
framework/source/fwe/classes/sfxhelperfunctions \
|
|
framework/source/fwe/dispatch/interaction \
|
|
framework/source/fwe/helper/actiontriggerhelper \
|
|
framework/source/fwe/helper/configimporter \
|
|
framework/source/fwe/helper/propertysetcontainer \
|
|
framework/source/fwe/helper/titlehelper \
|
|
framework/source/fwe/helper/documentundoguard \
|
|
framework/source/fwe/helper/undomanagerhelper \
|
|
framework/source/fwe/helper/windowstatehelper \
|
|
framework/source/fwe/xml/menuconfiguration \
|
|
framework/source/fwe/xml/menudocumenthandler \
|
|
framework/source/fwe/xml/saxnamespacefilter \
|
|
framework/source/fwe/xml/statusbarconfiguration \
|
|
framework/source/fwe/xml/statusbardocumenthandler \
|
|
framework/source/fwe/xml/toolboxconfiguration \
|
|
framework/source/fwe/xml/toolboxdocumenthandler \
|
|
framework/source/fwe/xml/xmlnamespaces \
|
|
framework/source/fwi/classes/converter \
|
|
framework/source/fwi/classes/protocolhandlercache \
|
|
framework/source/fwi/helper/mischelper \
|
|
framework/source/fwi/helper/shareablemutex \
|
|
framework/source/fwi/jobs/configaccess \
|
|
framework/source/fwi/threadhelp/transactionmanager \
|
|
framework/source/fwi/uielement/constitemcontainer \
|
|
framework/source/fwi/uielement/itemcontainer \
|
|
framework/source/fwi/uielement/rootitemcontainer \
|
|
framework/source/jobs/job \
|
|
framework/source/jobs/jobdata \
|
|
framework/source/jobs/jobdispatch \
|
|
framework/source/jobs/jobexecutor \
|
|
framework/source/jobs/jobresult \
|
|
framework/source/jobs/joburl \
|
|
framework/source/layoutmanager/helpers \
|
|
framework/source/layoutmanager/layoutmanager \
|
|
framework/source/layoutmanager/toolbarlayoutmanager \
|
|
framework/source/layoutmanager/uielement \
|
|
framework/source/loadenv/loadenv \
|
|
framework/source/loadenv/targethelper \
|
|
framework/source/recording/dispatchrecorder \
|
|
framework/source/recording/dispatchrecordersupplier \
|
|
framework/source/services/ContextChangeEventMultiplexer \
|
|
framework/source/services/desktop \
|
|
framework/source/services/dispatchhelper \
|
|
framework/source/services/frame \
|
|
framework/source/services/modulemanager \
|
|
framework/source/services/pathsettings \
|
|
framework/source/services/sessionlistener \
|
|
framework/source/services/substitutepathvars \
|
|
framework/source/services/taskcreatorsrv \
|
|
framework/source/services/urltransformer \
|
|
framework/source/services/mediatypedetectionhelper \
|
|
framework/source/services/uriabbreviation \
|
|
framework/source/uiconfiguration/CommandImageResolver \
|
|
framework/source/uiconfiguration/ImageList \
|
|
framework/source/uiconfiguration/globalsettings \
|
|
framework/source/uiconfiguration/graphicnameaccess \
|
|
framework/source/uiconfiguration/imagemanager \
|
|
framework/source/uiconfiguration/imagemanagerimpl \
|
|
framework/source/uiconfiguration/moduleuicfgsupplier \
|
|
framework/source/uiconfiguration/moduleuiconfigurationmanager \
|
|
framework/source/uiconfiguration/uicategorydescription \
|
|
framework/source/uiconfiguration/uiconfigurationmanager \
|
|
framework/source/uiconfiguration/windowstateconfiguration \
|
|
framework/source/uielement/addonstoolbarwrapper \
|
|
framework/source/uielement/buttontoolbarcontroller \
|
|
framework/source/uielement/comboboxtoolbarcontroller \
|
|
framework/source/uielement/complextoolbarcontroller \
|
|
framework/source/uielement/controlmenucontroller \
|
|
framework/source/uielement/dropdownboxtoolbarcontroller \
|
|
framework/source/uielement/edittoolbarcontroller \
|
|
framework/source/uielement/FixedImageToolbarController \
|
|
framework/source/uielement/FixedTextToolbarController \
|
|
framework/source/uielement/genericstatusbarcontroller \
|
|
framework/source/uielement/generictoolbarcontroller \
|
|
framework/source/uielement/imagebuttontoolbarcontroller \
|
|
framework/source/uielement/langselectionstatusbarcontroller \
|
|
framework/source/uielement/menubarmanager \
|
|
framework/source/uielement/menubarmerger \
|
|
framework/source/uielement/menubarwrapper \
|
|
framework/source/uielement/objectmenucontroller \
|
|
framework/source/uielement/popuptoolbarcontroller \
|
|
framework/source/uielement/progressbarwrapper \
|
|
framework/source/uielement/recentfilesmenucontroller \
|
|
framework/source/uielement/resourcemenucontroller \
|
|
framework/source/uielement/spinfieldtoolbarcontroller \
|
|
framework/source/uielement/statusbar \
|
|
framework/source/uielement/statusbaritem \
|
|
framework/source/uielement/statusbarmanager \
|
|
framework/source/uielement/statusbarmerger \
|
|
framework/source/uielement/statusbarwrapper \
|
|
framework/source/uielement/statusindicatorinterfacewrapper \
|
|
framework/source/uielement/styletoolbarcontroller \
|
|
framework/source/uielement/subtoolbarcontroller \
|
|
framework/source/uielement/thesaurusmenucontroller \
|
|
framework/source/uielement/togglebuttontoolbarcontroller \
|
|
framework/source/uielement/toolbarmanager \
|
|
framework/source/uielement/toolbarmerger \
|
|
framework/source/uielement/toolbarwrapper \
|
|
framework/source/uielement/uicommanddescription \
|
|
framework/source/uielement/fontmenucontroller \
|
|
framework/source/uielement/fontsizemenucontroller \
|
|
framework/source/uielement/footermenucontroller \
|
|
framework/source/uielement/headermenucontroller \
|
|
framework/source/uielement/langselectionmenucontroller \
|
|
framework/source/uielement/macrosmenucontroller \
|
|
framework/source/uielement/newmenucontroller \
|
|
framework/source/uielement/toolbarmodemenucontroller \
|
|
framework/source/uielement/toolbarsmenucontroller \
|
|
framework/source/uifactory/addonstoolbarfactory \
|
|
framework/source/uifactory/factoryconfiguration \
|
|
framework/source/uifactory/menubarfactory \
|
|
framework/source/uifactory/statusbarfactory \
|
|
framework/source/uifactory/toolbarfactory \
|
|
framework/source/uifactory/uicontrollerfactory \
|
|
framework/source/uifactory/uielementfactorymanager \
|
|
framework/source/uifactory/windowcontentfactorymanager \
|
|
framework/source/xml/acceleratorconfigurationreader \
|
|
framework/source/xml/acceleratorconfigurationwriter \
|
|
framework/source/xml/imagesconfiguration \
|
|
framework/source/xml/imagesdocumenthandler \
|
|
))
|
|
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_Library_use_system_win32_libs,fwk,\
|
|
advapi32 \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|