diff options
| -rw-r--r-- | framework/util/fwk.component | 1 | ||||
| -rwxr-xr-x | offapi/UnoApi_offapi.mk | 1 | ||||
| -rw-r--r-- | offapi/com/sun/star/ui/WindowContentFactoryManager.idl | 6 | ||||
| -rw-r--r-- | offapi/com/sun/star/ui/theWindowContentFactoryManager.idl | 41 | ||||
| -rw-r--r-- | sfx2/inc/pch/precompiled_sfx.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 4 |
6 files changed, 50 insertions, 5 deletions
diff --git a/framework/util/fwk.component b/framework/util/fwk.component index f81a53cf7599..cd4014585d71 100644 --- a/framework/util/fwk.component +++ b/framework/util/fwk.component @@ -156,6 +156,7 @@ </implementation> <implementation name="com.sun.star.comp.framework.WindowContentFactoryManager"> <service name="com.sun.star.ui.WindowContentFactoryManager"/> + <singleton name="com.sun.star.ui.theWindowContentFactoryManager"/> </implementation> <implementation name="com.sun.star.comp.framework.WindowStateConfiguration"> <service name="com.sun.star.ui.WindowStateConfiguration"/> diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 0314edb040d2..9df3d699f801 100755 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -427,6 +427,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/ui,\ WindowStateConfiguration \ theUICategoryDescription \ theUIElementFactoryManager \ + theWindowContentFactoryManager \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/ui/dialogs,\ AddressBookSourcePilot \ diff --git a/offapi/com/sun/star/ui/WindowContentFactoryManager.idl b/offapi/com/sun/star/ui/WindowContentFactoryManager.idl index 95ea4ce47e36..bddb5a7f96c5 100644 --- a/offapi/com/sun/star/ui/WindowContentFactoryManager.idl +++ b/offapi/com/sun/star/ui/WindowContentFactoryManager.idl @@ -26,9 +26,11 @@ module com { module sun { module star { module ui { /** - This interface could be imcomplete since I derived it from it's sole place of use. + A legacy (single-instance) service-variant of theWindowContentFactoryManager singleton. - @since LibreOffice 4.1 + @deprecated Use theWindowContentFactoryManager singleton instead. + + @since LibreOffice 4.1 */ service WindowContentFactoryManager : com::sun::star::lang::XSingleComponentFactory; diff --git a/offapi/com/sun/star/ui/theWindowContentFactoryManager.idl b/offapi/com/sun/star/ui/theWindowContentFactoryManager.idl new file mode 100644 index 000000000000..79b934642c99 --- /dev/null +++ b/offapi/com/sun/star/ui/theWindowContentFactoryManager.idl @@ -0,0 +1,41 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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 . + */ +#ifndef __com_sun_star_ui_theWindowContentFactoryManager_idl__ +#define __com_sun_star_ui_theWindowContentFactoryManager_idl__ + +#include <com/sun/star/lang/XSingleComponentFactory.idl> + + +module com { module sun { module star { module ui { + + +/** + This interface could be imcomplete since I derived it from it's sole place of use. + + Prior to LibreOffice 4.3, this singleton was only available as a + (single-instance) WindowContentFactoryManager service. + + @since LibreOffice 4.3 +*/ +singleton theWindowContentFactoryManager : com::sun::star::lang::XSingleComponentFactory; + +}; }; }; }; + +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 9d715a6e775d..5a6b6c1823f4 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -445,7 +445,7 @@ #include <com/sun/star/ui/UIConfigurationManager.hpp> #include <com/sun/star/ui/theUIElementFactoryManager.hpp> #include <com/sun/star/ui/UIElementType.hpp> -#include <com/sun/star/ui/WindowContentFactoryManager.hpp> +#include <com/sun/star/ui/theWindowContentFactoryManager.hpp> #include <com/sun/star/ui/WindowStateConfiguration.hpp> #include <com/sun/star/ui/XDockingAreaAcceptor.hpp> #include <com/sun/star/ui/XImageManager.hpp> diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 4c9670197718..5b73ec158ea7 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/WindowStateConfiguration.hpp> -#include <com/sun/star/ui/WindowContentFactoryManager.hpp> +#include <com/sun/star/ui/theWindowContentFactoryManager.hpp> #define MAX_TOGGLEAREA_WIDTH 20 #define MAX_TOGGLEAREA_HEIGHT 20 @@ -139,7 +139,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , // Use factory manager to retrieve XWindow factory. That can be used to instantiate // the real window factory. - uno::Reference< lang::XSingleComponentFactory > xFactoryMgr = ui::WindowContentFactoryManager::create(xContext); + uno::Reference< lang::XSingleComponentFactory > xFactoryMgr = ui::theWindowContentFactoryManager::get(xContext); SfxDispatcher* pDispatcher = pBindings->GetDispatcher(); uno::Reference< frame::XFrame > xFrame( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); |