INTEGRATION: CWS removedrafts (1.2.114); FILE MERGED

2005/02/17 12:47:53 cd 1.2.114.1: #i42557# move UNOIDL types from drafts to com

1 files changed, 13 insertions, 13 deletions

diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index 84871c5cdbf3..58d83c3616bc 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: statusbarfactory.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obo $ $Date: 2004-09-09 17:12:52 $
+ *  last change: $Author: kz $ $Date: 2005-03-01 19:46:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,12 +95,12 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_
-#include <drafts/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#ifndef _COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_
+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_
-#include <drafts/com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_
+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #endif
 
 //_________________________________________________________________________________________________________________
@@ -128,7 +128,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::util;
-using namespace drafts::com::sun::star::ui;
+using namespace ::com::sun::star::ui;
 
 namespace framework
 {
@@ -140,13 +140,13 @@ DEFINE_XINTERFACE_3                    (    StatusBarFactory
                                             OWeakObject                                                     ,
                                             DIRECT_INTERFACE( css::lang::XTypeProvider                      ),
                                             DIRECT_INTERFACE( css::lang::XServiceInfo                       ),
-                                            DIRECT_INTERFACE( drafts::com::sun::star::ui::XUIElementFactory )
+                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementFactory )
                                         )
 
 DEFINE_XTYPEPROVIDER_3                  (   StatusBarFactory                                ,
                                             css::lang::XTypeProvider                        ,
                                             css::lang::XServiceInfo                         ,
-                                            drafts::com::sun::star::ui::XUIElementFactory
+                                            ::com::sun::star::ui::XUIElementFactory
                                         )
 
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   StatusBarFactory                                ,
@@ -161,7 +161,7 @@ StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::co
     ThreadHelpBase( &Application::GetSolarMutex() )
     , m_xServiceManager( xServiceManager )
     , m_xModuleManager( xServiceManager->createInstance(
-                            OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.frame.ModuleManager" ))),
+                            OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))),
                         UNO_QUERY )
 {
 }
@@ -227,9 +227,9 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
                 rtl::OUString aModuleIdentifier = m_xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ));
                 if ( aModuleIdentifier.getLength() )
                 {
-                    Reference< ::drafts::com::sun::star::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(
+                    Reference< ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(
                         m_xServiceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(
-                            "drafts.com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))),
+                            "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))),
                         UNO_QUERY );
                     xCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier );
                     bHasSettings = xCfgMgr->hasSettings( aResourceURL );
@@ -255,7 +255,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
 
     vos::OGuard aGuard( Application::GetSolarMutex() );
     StatusBarWrapper* pStatusBarWrapper = new StatusBarWrapper( m_xServiceManager );
-    Reference< drafts::com::sun::star::ui::XUIElement > xStatusBar( (OWeakObject *)pStatusBarWrapper, UNO_QUERY );
+    Reference< ::com::sun::star::ui::XUIElement > xStatusBar( (OWeakObject *)pStatusBarWrapper, UNO_QUERY );
     Reference< XInitialization > xInit( xStatusBar, UNO_QUERY );
     xInit->initialize( aPropSeq );
     return xStatusBar;