diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:29:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:29:30 +0000 |
| commit | 4b68e6bff27df4283f56fc732adc3571d9c1d867 (patch) | |
| tree | 8c4a5e9855de704ef14236f24d0826415b62640a /framework/inc/services/backingcomp.hxx | |
| parent | f27cf37ddebc862d3480c34b8ff2e19437a4e41d (diff) | |
INTEGRATION: CWS recovery04 (1.4.32); FILE MERGED
2004/10/20 13:08:34 as 1.4.32.2: #i27726# redesign progress implementation after resync
2004/10/19 06:24:00 hro 1.4.32.1: #i28480# Resolved merge conflicts
Diffstat (limited to 'framework/inc/services/backingcomp.hxx')
| -rw-r--r-- | framework/inc/services/backingcomp.hxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx index 0a3b4dc2b94f..a1d1b871deec 100644 --- a/framework/inc/services/backingcomp.hxx +++ b/framework/inc/services/backingcomp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: backingcomp.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2004-09-09 17:06:51 $ + * last change: $Author: rt $ $Date: 2004-11-26 14:29:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,14 +112,6 @@ #include <com/sun/star/frame/XFrame.hpp> #endif -#ifndef _COM_SUN_STAR_TASK_XSTATUSINDICATORSUPPLIER_HPP_ -#include <com/sun/star/task/XStatusIndicatorSupplier.hpp> -#endif - -#ifndef _COM_SUN_STAR_TASK_XSTATUSINDICATORFACTORY_HPP_ -#include <com/sun/star/task/XStatusIndicatorFactory.hpp> -#endif - #ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #endif @@ -164,7 +156,6 @@ namespace framework class BackingComp : public css::lang::XTypeProvider , public css::lang::XServiceInfo , public css::lang::XInitialization - , public css::task::XStatusIndicatorSupplier , public css::frame::XController // => XComponent , public css::awt::XKeyListener // => XEventListener // attention! Must be the first base class to guarentee right initialize lock ... @@ -221,9 +212,6 @@ class BackingComp : public css::lang::XTypeProvider // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArgs ) throw(css::uno::Exception, css::uno::RuntimeException); - // XStatusIndicatorSupplier - virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator() throw(css::uno::RuntimeException); - // XController virtual void SAL_CALL attachFrame ( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw(css::uno::RuntimeException); virtual sal_Bool SAL_CALL attachModel ( const css::uno::Reference< css::frame::XModel >& xModel ) throw(css::uno::RuntimeException); @@ -257,7 +245,6 @@ class BackingComp : public css::lang::XTypeProvider private: - void impl_resizeStatusBar(); DECL_LINK( impl_asyncCallback, void* ); }; |