slidecopy: moved XToolPanel from css.view to css.ui, now that it is an XUIElement
This commit is contained in:
parent
7c9c5e1d80
commit
cc7338c3b0
2 changed files with 5 additions and 5 deletions
|
@ -36,7 +36,7 @@
|
||||||
/** === begin UNO includes === **/
|
/** === begin UNO includes === **/
|
||||||
#include <com/sun/star/frame/XModuleManager.hpp>
|
#include <com/sun/star/frame/XModuleManager.hpp>
|
||||||
#include <com/sun/star/container/XNameAccess.hpp>
|
#include <com/sun/star/container/XNameAccess.hpp>
|
||||||
#include <com/sun/star/view/XToolPanel.hpp>
|
#include <com/sun/star/ui/XToolPanel.hpp>
|
||||||
#include <com/sun/star/ui/XUIElementFactory.hpp>
|
#include <com/sun/star/ui/XUIElementFactory.hpp>
|
||||||
#include <com/sun/star/awt/XWindowPeer.hpp>
|
#include <com/sun/star/awt/XWindowPeer.hpp>
|
||||||
#include <com/sun/star/awt/PosSize.hpp>
|
#include <com/sun/star/awt/PosSize.hpp>
|
||||||
|
@ -78,7 +78,7 @@ namespace sfx2
|
||||||
using ::com::sun::star::uno::Type;
|
using ::com::sun::star::uno::Type;
|
||||||
using ::com::sun::star::frame::XModuleManager;
|
using ::com::sun::star::frame::XModuleManager;
|
||||||
using ::com::sun::star::container::XNameAccess;
|
using ::com::sun::star::container::XNameAccess;
|
||||||
using ::com::sun::star::view::XToolPanel;
|
using ::com::sun::star::ui::XToolPanel;
|
||||||
using ::com::sun::star::ui::XUIElementFactory;
|
using ::com::sun::star::ui::XUIElementFactory;
|
||||||
using ::com::sun::star::ui::XUIElement;
|
using ::com::sun::star::ui::XUIElement;
|
||||||
using ::com::sun::star::awt::XWindow;
|
using ::com::sun::star::awt::XWindow;
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#define SD_WORKBENCH_CTP_PANEL_HXX
|
#define SD_WORKBENCH_CTP_PANEL_HXX
|
||||||
|
|
||||||
/** === begin UNO includes === **/
|
/** === begin UNO includes === **/
|
||||||
#include <com/sun/star/view/XToolPanel.hpp>
|
#include <com/sun/star/ui/XToolPanel.hpp>
|
||||||
#include <com/sun/star/uno/XComponentContext.hpp>
|
#include <com/sun/star/uno/XComponentContext.hpp>
|
||||||
#include <com/sun/star/awt/XPaintListener.hpp>
|
#include <com/sun/star/awt/XPaintListener.hpp>
|
||||||
#include <com/sun/star/awt/XWindow.hpp>
|
#include <com/sun/star/awt/XWindow.hpp>
|
||||||
|
@ -49,7 +49,7 @@ namespace sd { namespace colortoolpanel
|
||||||
//==================================================================================================================
|
//==================================================================================================================
|
||||||
//= SingleColorPanel
|
//= SingleColorPanel
|
||||||
//==================================================================================================================
|
//==================================================================================================================
|
||||||
typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::view::XToolPanel
|
typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::ui::XToolPanel
|
||||||
, ::com::sun::star::awt::XPaintListener
|
, ::com::sun::star::awt::XPaintListener
|
||||||
> SingleColorPanel_Base;
|
> SingleColorPanel_Base;
|
||||||
class SingleColorPanel :public ::cppu::BaseMutex
|
class SingleColorPanel :public ::cppu::BaseMutex
|
||||||
|
@ -113,7 +113,7 @@ namespace sd { namespace colortoolpanel
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const ::rtl::OUString m_sResourceURL;
|
const ::rtl::OUString m_sResourceURL;
|
||||||
::com::sun::star::uno::Reference< ::com::sun::star::view::XToolPanel >
|
::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel >
|
||||||
m_xToolPanel;
|
m_xToolPanel;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue