diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-27 13:43:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-27 15:03:32 +0200 |
| commit | a00c4e02acd1b7a3ab126941166aa2d12c7eb3fc (patch) | |
| tree | 124a0877db6e0921b9a1237261106b63d94c1c9f /svtools | |
| parent | fdo#46808, Adapt sdb::DatabaseContext UNO service to new style (diff) | |
| download | core-a00c4e02acd1b7a3ab126941166aa2d12c7eb3fc.tar.gz core-a00c4e02acd1b7a3ab126941166aa2d12c7eb3fc.zip | |
Improvements on previous commit
* Made XDatabaseContext inherit XDatabaseRegistrations non-optionally, adapted
call-sites to just use XDatabaseContext w/o querying. (The previous commit
had inadvertantly effectively removed support for XDatabaseRegistrations from
the ODatabaseContext implementation, as an optional UNO super-interface does
not lead to a super-class in the corresponding C++ class hierarchy, but making
the super-interface non-optional fixes that anyway.)
* Adapted some more call-sites to just use XDatabaseContext w/o querying.
* Added @since tag.
* Replaced new uses of comphelper::ComponentContext::getUNOContext with
comphelper::getComponentContext (see 03a9f139bd9ea1a4f9096fc982e6b326def58532
"ComponentContext::getUnoContext -> getComponentContext simplification;" I
intend to get rid of comphelper/componentcontext.hxx much sooner than of
comphelper/processfactory.hxx).
Change-Id: I68d09f2dbe651629f79ed21cd40cdb6d6b32c624
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 7d362fefff84..49f7ca5204ba 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -34,7 +34,6 @@ #include <svtools/helpid.hrc> #include <svtools/svtresid.hxx> #include <tools/debug.hxx> -#include <comphelper/componentcontext.hxx> #include <comphelper/extract.hxx> #include <comphelper/interaction.hxx> #include <comphelper/processfactory.hxx> @@ -801,7 +800,7 @@ void AssignmentPersistentData::Commit() try { - m_xDatabaseContext = DatabaseContext::create(comphelper::ComponentContext(m_xORB).getUNOContext()); + m_xDatabaseContext = DatabaseContext::create(comphelper::getComponentContext(m_xORB)); } catch(Exception&) { } if (!m_xDatabaseContext.is()) |