namespace changes

1 files changed, 38 insertions, 38 deletions

diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 9a3c30cfc5af..5c4889a05745 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ImageControl.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-19 11:52:16 $
+ *  last change: $Author: oj $ $Date: 2000-11-23 08:48:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,12 +89,12 @@ namespace frm
 // OImageControlModel
 //==================================================================
 class OImageControlModel
-                :public starform::XImageProducerSupplier
+                :public ::com::sun::star::form::XImageProducerSupplier
                 ,public ::comphelper::OAggregationArrayUsageHelper<OImageControlModel>
                 ,public OBoundControlModel
                 ,public OPropertyChangeListener
 {
-    staruno::Reference<starawt::XImageProducer>     m_xImageProducer;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer>    m_xImageProducer;
     ImageProducer*                                  m_pImageProducer;
     sal_Bool                m_bReadOnly;
 
@@ -103,7 +103,7 @@ class OImageControlModel
 
 protected:
     // UNO Anbindung
-    virtual staruno::Sequence<staruno::Type> _getTypes();
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
     virtual void _onValueChanged();
 
     virtual sal_Bool        _approve(sal_Int32 _nColumnType);
@@ -111,24 +111,24 @@ protected:
     inline ImageProducer* GetImageProducer() { return m_pImageProducer; }
 
 public:
-    OImageControlModel(const staruno::Reference<starlang::XMultiServiceFactory>& _rxFactory);
+    OImageControlModel(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
     virtual ~OImageControlModel();
 
-    virtual void SAL_CALL getFastPropertyValue(staruno::Any& rValue, sal_Int32 nHandle ) const;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const staruno::Any& rValue);
+    virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue);
 
-    virtual sal_Bool SAL_CALL convertFastPropertyValue(staruno::Any& rConvertedValue, staruno::Any& rOldValue, sal_Int32 nHandle, const staruno::Any& rValue )
-        throw(starlang::IllegalArgumentException);
+    virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
+        throw(::com::sun::star::lang::IllegalArgumentException);
 
     // UNO Anbindung
     DECLARE_UNO3_AGG_DEFAULTS(OImageControlModel, OBoundControlModel);
-    virtual staruno::Any SAL_CALL queryAggregation(const staruno::Type& _rType) throw(staruno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException);
 
-// starform::XBoundComponent
-    virtual staruno::Any _getControlValue() const;
+// ::com::sun::star::form::XBoundComponent
+    virtual ::com::sun::star::uno::Any _getControlValue() const;
     virtual void _reset();
 
-// starlang::XServiceInfo
+// ::com::sun::star::lang::XServiceInfo
     IMPLEMENTATION_NAME(OImageControlModel);
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw();
 
@@ -136,24 +136,24 @@ public:
     virtual void SAL_CALL disposing();
 
 // OPropertyChangeListener
-    virtual void _propertyChanged( const starbeans::PropertyChangeEvent& ) throw(staruno::RuntimeException);
+    virtual void _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& ) throw(::com::sun::star::uno::RuntimeException);
 
-// staruno::Reference<starbeans::XPropertySet>
-    virtual staruno::Reference<starbeans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(staruno::RuntimeException);
+// ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
-// stario::XPersistObject
+// ::com::sun::star::io::XPersistObject
     virtual ::rtl::OUString SAL_CALL getServiceName();
-    virtual void SAL_CALL write(const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream);
-    virtual void SAL_CALL read(const staruno::Reference<stario::XObjectInputStream>& _rxInStream);
+    virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream);
+    virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream);
 
-// starform::XImageProducerSupplier
-    virtual staruno::Reference<starawt::XImageProducer> SAL_CALL getImageProducer() { return m_xImageProducer; }
+// ::com::sun::star::form::XImageProducerSupplier
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> SAL_CALL getImageProducer() { return m_xImageProducer; }
 
 // ::comphelper::OAggregationArrayUsageHelper
     virtual void fillProperties(
-        staruno::Sequence< starbeans::Property >& /* [out] */ _rProps,
-        staruno::Sequence< starbeans::Property >& /* [out] */ _rAggregateProps
+        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps,
+        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps
         ) const;
     IMPLEMENT_INFO_SERVICE()
 };
@@ -161,36 +161,36 @@ public:
 //==================================================================
 // OImageControlControl
 //==================================================================
-class OImageControlControl : public starawt::XMouseListener,
+class OImageControlControl : public ::com::sun::star::awt::XMouseListener,
                                public OBoundControl
 {
 protected:
     // UNO Anbindung
-    virtual staruno::Sequence<staruno::Type> _getTypes();
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
 
 public:
-    OImageControlControl(const staruno::Reference<starlang::XMultiServiceFactory>& _rxFactory);
+    OImageControlControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
 
 // UNO Anbindung
     DECLARE_UNO3_AGG_DEFAULTS(OImageControlControl, OBoundControl);
-    virtual staruno::Any SAL_CALL queryAggregation(const staruno::Type& _rType) throw(staruno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException);
 
-// starlang::XEventListener
-    virtual void SAL_CALL disposing(const starlang::EventObject& _rSource) throw(staruno::RuntimeException)
+// ::com::sun::star::lang::XEventListener
+    virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException)
         { OBoundControl::disposing(_rSource); }
 
-// starlang::XServiceInfo
+// ::com::sun::star::lang::XServiceInfo
     IMPLEMENTATION_NAME(OImageControlControl);
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw();
 
-// starawt::XMouseListener
-    virtual void SAL_CALL mousePressed(const starawt::MouseEvent& e);
-    virtual void SAL_CALL mouseReleased(const starawt::MouseEvent& e) { }
-    virtual void SAL_CALL mouseEntered(const starawt::MouseEvent& e)    { }
-    virtual void SAL_CALL mouseExited(const starawt::MouseEvent& e) { }
+// ::com::sun::star::awt::XMouseListener
+    virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e);
+    virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) { }
+    virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e)  { }
+    virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) { }
 
-// starawt::XControl
-    virtual void SAL_CALL createPeer(const staruno::Reference<starawt::XToolkit>& _rToolkit, const staruno::Reference<starawt::XWindowPeer>& _rParent) throw(staruno::RuntimeException);
+// ::com::sun::star::awt::XControl
+    virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& _rParent) throw(::com::sun::star::uno::RuntimeException);
 };
 
 //.........................................................................