Kaydet (Commit) a4b9bfb9 authored tarafından Stefan Weiberg's avatar Stefan Weiberg Kaydeden (comit) Thomas Arnhold

Related fdo#82088: removing and shortening aliases

Change-Id: Iebd9124daffe98b1e38dfa71d8b11f2452e3ddaa
Reviewed-on: https://gerrit.libreoffice.org/11226Reviewed-by: 's avatarThomas Arnhold <thomas@arnhold.org>
Tested-by: 's avatarThomas Arnhold <thomas@arnhold.org>
üst 2ec55fd6
...@@ -85,8 +85,8 @@ using ::com::sun::star::awt::XTabController; ...@@ -85,8 +85,8 @@ using ::com::sun::star::awt::XTabController;
namespace dbaui namespace dbaui
{ {
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject; namespace DatabaseObject = css::sdb::application::DatabaseObject;
namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer; namespace DatabaseObjectContainer = css::sdb::application::DatabaseObjectContainer;
} }
namespace namespace
......
...@@ -355,7 +355,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView ...@@ -355,7 +355,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView
m_aDescription.SetText(ModuleRes(STR_DESCRIPTION)); m_aDescription.SetText(ModuleRes(STR_DESCRIPTION));
ImageProvider aImageProvider; ImageProvider aImageProvider;
Image aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM ); Image aFolderImage = aImageProvider.getFolderImage( css::sdb::application::DatabaseObject::FORM );
m_aCreation.SetDefaultCollapsedEntryBmp( aFolderImage ); m_aCreation.SetDefaultCollapsedEntryBmp( aFolderImage );
m_aCreation.SetDefaultExpandedEntryBmp( aFolderImage ); m_aCreation.SetDefaultExpandedEntryBmp( aFolderImage );
......
...@@ -176,15 +176,15 @@ sal_Int32 SbaTableQueryBrowser::getDatabaseObjectType( EntryType _eType ) ...@@ -176,15 +176,15 @@ sal_Int32 SbaTableQueryBrowser::getDatabaseObjectType( EntryType _eType )
{ {
case etQuery: case etQuery:
case etQueryContainer: case etQueryContainer:
return DatabaseObject::QUERY; return css::sdb::application::DatabaseObject::QUERY;
case etTableOrView: case etTableOrView:
case etTableContainer: case etTableContainer:
return DatabaseObject::TABLE; return css::sdb::application::DatabaseObject::TABLE;
default: default:
break; break;
} }
OSL_FAIL( "SbaTableQueryBrowser::getDatabaseObjectType: folder types and 'Unknown' not allowed here!" ); OSL_FAIL( "SbaTableQueryBrowser::getDatabaseObjectType: folder types and 'Unknown' not allowed here!" );
return DatabaseObject::TABLE; return css::sdb::application::DatabaseObject::TABLE;
} }
void SbaTableQueryBrowser::notifyHiContrastChanged() void SbaTableQueryBrowser::notifyHiContrastChanged()
......
...@@ -163,8 +163,8 @@ extern "C" void SAL_CALL createRegistryInfo_OBrowser() ...@@ -163,8 +163,8 @@ extern "C" void SAL_CALL createRegistryInfo_OBrowser()
namespace dbaui namespace dbaui
{ {
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject; namespace DatabaseObject = css::sdb::application::DatabaseObject;
namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer; namespace DatabaseObjectContainer = css::sdb::application::DatabaseObjectContainer;
void SafeAddPropertyListener(const Reference< XPropertySet > & xSet, const OUString& rPropName, XPropertyChangeListener* pListener) void SafeAddPropertyListener(const Reference< XPropertySet > & xSet, const OUString& rPropName, XPropertyChangeListener* pListener)
{ {
......
...@@ -274,7 +274,7 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ ) ...@@ -274,7 +274,7 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
try try
{ {
ImageProvider aImageProvider( m_xConnection ); 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.SetDefaultExpandedEntryBmp( aQueryImage );
m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage ); m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage );
......
...@@ -29,10 +29,6 @@ ...@@ -29,10 +29,6 @@
namespace dbaui namespace dbaui
{ {
// for convenience of our clients
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
// ImageProvider // ImageProvider
struct ImageProvider_Data; struct ImageProvider_Data;
/** provides images for database objects such as tables, queries, forms, reports ... /** provides images for database objects such as tables, queries, forms, reports ...
......
...@@ -45,7 +45,8 @@ namespace dbaui ...@@ -45,7 +45,8 @@ namespace dbaui
using ::com::sun::star::sdbcx::XViewsSupplier; using ::com::sun::star::sdbcx::XViewsSupplier;
using ::com::sun::star::uno::UNO_SET_THROW; 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 // ImageProvider_Data
struct ImageProvider_Data struct ImageProvider_Data
......
...@@ -59,6 +59,8 @@ using namespace ::com::sun::star::container; ...@@ -59,6 +59,8 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::accessibility;
namespace DatabaseObject = css::sdb::application::DatabaseObject;
#define TABWIN_SIZING_AREA 4 #define TABWIN_SIZING_AREA 4
#define TABWIN_WIDTH_MIN 90 #define TABWIN_WIDTH_MIN 90
#define TABWIN_HEIGHT_MIN 80 #define TABWIN_HEIGHT_MIN 80
......
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
#include <uno/mapping.hxx> #include <uno/mapping.hxx>
namespace cssuno = com::sun::star::uno;
namespace cppu namespace cppu
{ {
/** Environment Guard /** Environment Guard
...@@ -38,14 +35,14 @@ namespace cppu ...@@ -38,14 +35,14 @@ namespace cppu
*/ */
class EnvGuard class EnvGuard
{ {
cssuno::Environment m_env; css::uno::Environment m_env;
public: public:
explicit EnvGuard(cssuno::Environment const & env) explicit EnvGuard(css::uno::Environment const & env)
{ {
if (env.is()) if (env.is())
{ {
m_env = cssuno::Environment::getCurrent(); m_env = css::uno::Environment::getCurrent();
env.enter(); env.enter();
} }
} }
...@@ -86,11 +83,11 @@ namespace cppu ...@@ -86,11 +83,11 @@ namespace cppu
*/ */
class AntiEnvGuard class AntiEnvGuard
{ {
cssuno::Environment m_env; css::uno::Environment m_env;
public: public:
explicit AntiEnvGuard() explicit AntiEnvGuard()
: m_env(cssuno::Environment::getCurrent()) : m_env(css::uno::Environment::getCurrent())
{ {
uno_Environment_enter(NULL); uno_Environment_enter(NULL);
} }
......
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <uno/mapping.hxx> #include <uno/mapping.hxx>
namespace cssu = com::sun::star::uno;
namespace cppu namespace cppu
{ {
/** Helpers for mapping objects relative to the current environment. /** Helpers for mapping objects relative to the current environment.
...@@ -38,11 +36,11 @@ namespace cppu ...@@ -38,11 +36,11 @@ namespace cppu
@return the mapped object @return the mapped object
@since UDK 3.2.7 @since UDK 3.2.7
*/ */
template<class T> inline T * mapOut(T * pT, cssu::Environment const & outerEnv) template<class T> inline T * mapOut(T * pT, css::uno::Environment const & outerEnv)
{ {
cssu::Mapping curr2outer(cssu::Environment::getCurrent(), outerEnv); css::uno::Mapping curr2outer(css::uno::Environment::getCurrent(), outerEnv);
return reinterpret_cast<T *>(curr2outer.mapInterface(pT, getCppuType((cssu::Reference<T> *)NULL))); return reinterpret_cast<T *>(curr2outer.mapInterface(pT, getCppuType((css::uno::Reference<T> *)NULL)));
} }
...@@ -53,11 +51,11 @@ namespace cppu ...@@ -53,11 +51,11 @@ namespace cppu
@return the mapped object @return the mapped object
@since UDK 3.2.7 @since UDK 3.2.7
*/ */
template<class T> inline T * mapIn(T * pT, cssu::Environment const & outerEnv) template<class T> inline T * mapIn(T * pT, css::uno::Environment const & outerEnv)
{ {
cssu::Mapping outer2curr(outerEnv, cssu::Environment::getCurrent()); css::uno::Mapping outer2curr(outerEnv, css::uno::Environment::getCurrent());
return reinterpret_cast<T *>(outer2curr.mapInterface(pT, getCppuType((cssu::Reference<T> *)NULL))); return reinterpret_cast<T *>(outer2curr.mapInterface(pT, getCppuType((css::uno::Reference<T> *)NULL)));
} }
...@@ -69,11 +67,11 @@ namespace cppu ...@@ -69,11 +67,11 @@ namespace cppu
@since UDK 3.2.7 @since UDK 3.2.7
*/ */
// Problem: any gets assigned to something, acquire/releases may be called in wrong env. // Problem: any gets assigned to something, acquire/releases may be called in wrong env.
inline void mapOutAny(cssu::Any const & any, cssu::Any * res, cssu::Environment const & outerEnv) inline void mapOutAny(css::uno::Any const & any, css::uno::Any * res, css::uno::Environment const & outerEnv)
{ {
cssu::Mapping curr2outer(cssu::Environment::getCurrent(), outerEnv); css::uno::Mapping curr2outer(css::uno::Environment::getCurrent(), outerEnv);
uno_any_destruct(res, (uno_ReleaseFunc)cssu::cpp_release); uno_any_destruct(res, (uno_ReleaseFunc)css::uno::cpp_release);
uno_type_any_constructAndConvert( uno_type_any_constructAndConvert(
res, res,
const_cast<void *>(any.getValue()), const_cast<void *>(any.getValue()),
...@@ -89,11 +87,11 @@ namespace cppu ...@@ -89,11 +87,11 @@ namespace cppu
@param outerEnv the source environment @param outerEnv the source environment
@since UDK 3.2.7 @since UDK 3.2.7
*/ */
inline void mapInAny(cssu::Any const & any, cssu::Any * res, cssu::Environment const & outerEnv) inline void mapInAny(css::uno::Any const & any, css::uno::Any * res, css::uno::Environment const & outerEnv)
{ {
cssu::Mapping outer2curr(outerEnv, cssu::Environment::getCurrent()); css::uno::Mapping outer2curr(outerEnv, css::uno::Environment::getCurrent());
uno_any_destruct(res, (uno_ReleaseFunc)cssu::cpp_release); uno_any_destruct(res, (uno_ReleaseFunc)css::uno::cpp_release);
uno_type_any_constructAndConvert( uno_type_any_constructAndConvert(
res, res,
const_cast<void *>(any.getValue()), const_cast<void *>(any.getValue()),
......
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