Skip to content

C
core
Kaydet (Commit) 5226e417 authored tarafından Kurt Zenker's avatar Kurt Zenker
Dosyalara gözat
Seçenekler

INTEGRATION: CWS removedrafts (1.3.62); FILE MERGED 

2005/02/17 12:45:55 cd 1.3.62.1: #i42557# move UNOIDL types from drafts to com
üst 29741a75
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
framework/inc/uielement/statusbarmanager.hxx
Dosyayı görüntüle @ 5226e417
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: statusbarmanager.hxx,v $ * $RCSfile: statusbarmanager.hxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: obo $ $Date: 2004-11-17 14:57:15 $ * last change: $Author: kz $ $Date: 2005-03-01 19:30:48 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -92,14 +92,14 @@ ...@@ -92,14 +92,14 @@
#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_ #ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_
#include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XStatusListener.hpp>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XUICONTROLLERREGISTRATION_HPP_ #ifndef _COM_SUN_STAR_FRAME_XUICONTROLLERREGISTRATION_HPP_
#include <drafts/com/sun/star/frame/XUIControllerRegistration.hpp> #include <com/sun/star/frame/XUIControllerRegistration.hpp>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATION_HPP_ #ifndef _COM_SUN_STAR_UI_XUICONFIGURATION_HPP_
#include <drafts/com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_ #ifndef _COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_
#include <drafts/com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/frame/XModuleManager.hpp>
#endif #endif
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
...@@ -130,7 +130,7 @@ class FrameworkStatusBar; ...@@ -130,7 +130,7 @@ class FrameworkStatusBar;
class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener , class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener ,
public ::com::sun::star::lang::XComponent , public ::com::sun::star::lang::XComponent ,
public ::com::sun::star::lang::XTypeProvider , public ::com::sun::star::lang::XTypeProvider ,
public ::drafts::com::sun::star::ui::XUIConfigurationListener, public ::com::sun::star::ui::XUIConfigurationListener,
public ThreadHelpBase , public ThreadHelpBase ,
public ::cppu::OWeakObject public ::cppu::OWeakObject
{ {
...@@ -156,9 +156,9 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener ...@@ -156,9 +156,9 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
// XUIConfigurationListener // XUIConfigurationListener
virtual void SAL_CALL elementInserted( const ::drafts::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL elementRemoved( const ::drafts::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL elementReplaced( const ::drafts::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
// XComponent // XComponent
void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
...@@ -196,7 +196,7 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener ...@@ -196,7 +196,7 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
StatusBarControllerVector m_aControllerVector; StatusBarControllerVector m_aControllerVector;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
::com::sun::star::uno::Reference< ::drafts::com::sun::star::frame::XUIControllerRegistration > m_xStatusbarControllerRegistration; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerRegistration > m_xStatusbarControllerRegistration;
}; };
} }
......
framework/inc/uielement/toolbarwrapper.hxx
Dosyayı görüntüle @ 5226e417
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: toolbarwrapper.hxx,v $ * $RCSfile: toolbarwrapper.hxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: obo $ $Date: 2004-11-16 14:51:47 $ * last change: $Author: kz $ $Date: 2005-03-01 19:31:31 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -128,9 +128,9 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener, ...@@ -128,9 +128,9 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener,
virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
// XUIConfigurationListener // XUIConfigurationListener
virtual void SAL_CALL elementInserted( const ::drafts::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL elementRemoved( const ::drafts::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL elementReplaced( const ::drafts::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
// XUIFunctionListener // XUIFunctionListener
virtual void SAL_CALL functionExecute( const ::rtl::OUString& aUIElementName, const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL functionExecute( const ::rtl::OUString& aUIElementName, const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment