8 files changed, 13 insertions, 14 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index c0cffcf5e339..d5b5838c952b 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -85,8 +85,8 @@ using ::com::sun::star::awt::XTabController;
 
 namespace dbaui
 {
-    namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
-    namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
+    namespace DatabaseObject = css::sdb::application::DatabaseObject;
+    namespace DatabaseObjectContainer = css::sdb::application::DatabaseObjectContainer;
 }
 
 namespace
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 477c0f3f40bd..8f3a8d8952a1 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -355,7 +355,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView
     m_aDescription.SetText(ModuleRes(STR_DESCRIPTION));
 
     ImageProvider aImageProvider;
-    Image aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM );
+    Image aFolderImage = aImageProvider.getFolderImage( css::sdb::application::DatabaseObject::FORM );
     m_aCreation.SetDefaultCollapsedEntryBmp( aFolderImage );
     m_aCreation.SetDefaultExpandedEntryBmp( aFolderImage );
 
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index a73f5ed0b7cd..39943907d534 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -176,15 +176,15 @@ sal_Int32 SbaTableQueryBrowser::getDatabaseObjectType( EntryType _eType )
     {
     case etQuery:
     case etQueryContainer:
-        return DatabaseObject::QUERY;
+        return css::sdb::application::DatabaseObject::QUERY;
     case etTableOrView:
     case etTableContainer:
-        return DatabaseObject::TABLE;
+        return css::sdb::application::DatabaseObject::TABLE;
     default:
         break;
     }
     OSL_FAIL( "SbaTableQueryBrowser::getDatabaseObjectType: folder types and 'Unknown' not allowed here!" );
-    return DatabaseObject::TABLE;
+    return css::sdb::application::DatabaseObject::TABLE;
 }
 
 void SbaTableQueryBrowser::notifyHiContrastChanged()
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index a2d1ea4f1999..1076accd5828 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -163,8 +163,8 @@ extern "C" void SAL_CALL createRegistryInfo_OBrowser()
 namespace dbaui
 {
 
-namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
-namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
+namespace DatabaseObject = css::sdb::application::DatabaseObject;
+namespace DatabaseObjectContainer = css::sdb::application::DatabaseObjectContainer;
 
 void SafeAddPropertyListener(const Reference< XPropertySet > & xSet, const OUString& rPropName, XPropertyChangeListener* pListener)
 {
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index df32b01ca670..e5721abe2ecc 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -274,7 +274,7 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
     try
     {
         ImageProvider aImageProvider( m_xConnection );
-        Image aQueryImage( aImageProvider.getDefaultImage( DatabaseObject::QUERY ) );
+        Image aQueryImage( aImageProvider.getDefaultImage( css::sdb::application::DatabaseObject::QUERY ) );
 
         m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImage );
         m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage );
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index 089385903d3f..ac73bf79cec5 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -29,10 +29,6 @@
 
 namespace dbaui
 {
-
-    // for convenience of our clients
-    namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
-
     // ImageProvider
     struct ImageProvider_Data;
     /** provides images for database objects such as tables, queries, forms, reports ...
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index 4529f0ecf3bf..f0562cccc8c5 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -45,7 +45,8 @@ namespace dbaui
     using ::com::sun::star::sdbcx::XViewsSupplier;
     using ::com::sun::star::uno::UNO_SET_THROW;
 
-    namespace GraphicColorMode = ::com::sun::star::graphic::GraphicColorMode;
+    namespace GraphicColorMode = css::graphic::GraphicColorMode;
+    namespace DatabaseObject = css::sdb::application::DatabaseObject;
 
     // ImageProvider_Data
     struct ImageProvider_Data
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index fcbb884784f5..31f354c0e7fb 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -59,6 +59,8 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::accessibility;
 
+namespace DatabaseObject = css::sdb::application::DatabaseObject;
+
 #define TABWIN_SIZING_AREA      4
 #define TABWIN_WIDTH_MIN    90
 #define TABWIN_HEIGHT_MIN   80