diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/Library_fwk.mk | 1 | ||||
| -rw-r--r-- | framework/Library_fwl.mk | 2 | ||||
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 1 | ||||
| -rw-r--r-- | framework/source/classes/fwktabwindow.cxx | 6 | ||||
| -rwxr-xr-x | framework/source/layoutmanager/layoutmanager.cxx | 2 | ||||
| -rwxr-xr-x | framework/source/layoutmanager/toolbarlayoutmanager.hxx | 2 | ||||
| -rw-r--r-- | framework/source/register/registerservices.cxx | 4 | ||||
| -rw-r--r-- | framework/source/register/registertemp.cxx | 2 |
8 files changed, 8 insertions, 12 deletions
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index c6bc71fadd6d..50c16b83b42a 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -71,6 +71,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/accelerators/storageholder \ framework/source/classes/droptargetlistener \ framework/source/classes/framecontainer \ + framework/source/classes/fwktabwindow \ framework/source/classes/menumanager \ framework/source/classes/taskcreator \ framework/source/constant/containerquery \ diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 1169bb750883..d2002115eaf0 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\ )) $(eval $(call gb_Library_add_exception_objects,fwl,\ - framework/source/classes/fwktabwindow \ framework/source/classes/fwlresid \ framework/source/dispatch/mailtodispatcher \ framework/source/dispatch/oxt_handler \ @@ -69,7 +68,6 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\ framework/source/services/dispatchhelper \ framework/source/services/license \ framework/source/services/mediatypedetectionhelper \ - framework/source/services/tabwindowservice \ framework/source/services/uriabbreviation \ framework/source/uielement/fontmenucontroller \ framework/source/uielement/fontsizemenucontroller \ diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 7fcbf4398efe..0110a0b40b9e 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -53,7 +53,6 @@ #include <uielement/menubarmanager.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> #include <framework/addonsoptions.hxx> -#include <classes/addonsoptions.hxx> #include <uielement/panelwindow.hxx> #include <uielement/uielement.hxx> #include <helper/ilayoutnotifications.hxx> diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index aa550807460c..a441f251a592 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -30,7 +30,7 @@ #include <classes/fwktabwindow.hxx> #include "framework.hrc" -#include <classes/fwlresid.hxx> +#include <classes/fwkresid.hxx> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XContainerWindowEventHandler.hpp> @@ -205,9 +205,9 @@ void FwkTabPage::Resize() FwkTabWindow::FwkTabWindow( Window* pParent ) : - Window( pParent, FwlResId( WIN_TABWINDOW ) ), + Window( pParent, FwkResId( WIN_TABWINDOW ) ), - m_aTabCtrl ( this, FwlResId( TC_TABCONTROL ) ) + m_aTabCtrl ( this, FwkResId( TC_TABCONTROL ) ) { uno::Reference < lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); m_xWinProvider = uno::Reference < awt::XContainerWindowProvider >( diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index d726d574d76d..4106e9d67353 100755 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -39,7 +39,7 @@ #include <services.h> #include <framework/sfxhelperfunctions.hxx> -#include <classes/sfxhelperfunctions.hxx> +#include <framework/sfxhelperfunctions.hxx> #include <uielement/menubarwrapper.hxx> #include <framework/addonsoptions.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index baf6f088cc2e..df6b36020f93 100755 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -52,7 +52,7 @@ #include <stdtypes.h> #include <uiconfiguration/globalsettings.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> #include <uielement/uielement.hxx> #include <helper/ilayoutnotifications.hxx> diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 4f078d9ab50d..fe9dfe2ee573 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -54,7 +54,7 @@ =================================================================================================================*/ #include <services/urltransformer.hxx> #include <services/desktop.hxx> -//#include <services/tabwindowservice.hxx> +#include <services/tabwindowservice.hxx> #include <services/frame.hxx> #include <services/modulemanager.hxx> //#include <dispatch/oxt_handler.hxx> @@ -169,7 +169,7 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer IFFACTORY( ::framework::LangSelectionStatusbarController ) else //IFFACTORY( ::framework::LanguageSelectionMenuController ) else IFFACTORY( ::framework::WindowContentFactoryManager ) else - //IFFACTORY( ::framework::TabWindowService ) else + IFFACTORY( ::framework::TabWindowService ) else IFFACTORY( ::framework::SubstitutePathVariables ) else IFFACTORY( ::framework::PathSettings ) ) diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index 111b3550559d..59444093d53e 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -65,7 +65,6 @@ #include <uielement/simpletextstatusbarcontroller.hxx> #include <uielement/logoimagestatusbarcontroller.hxx> #include <uielement/logotextstatusbarcontroller.hxx> -#include <services/tabwindowservice.hxx> #include <uielement/fontmenucontroller.hxx> #include <uielement/fontsizemenucontroller.hxx> #include <uielement/footermenucontroller.hxx> @@ -86,7 +85,6 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper IFFACTORY( ::framework::License ) else IFFACTORY( ::framework::PopupMenuDispatcher ) else IFFACTORY( ::framework::DispatchHelper ) else - IFFACTORY( ::framework::TabWindowService ) else IFFACTORY( ::framework::DispatchRecorder ) else IFFACTORY( ::framework::DispatchRecorderSupplier ) else IFFACTORY( ::framework::SimpleTextStatusbarController ) else |