diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-04 14:36:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-04 14:42:52 +0200 |
| commit | dd11a1e57a2565560803dc3fef5fccc9e7157105 (patch) | |
| tree | 4adf17c00e21a17b0137a286ce1547b0e56bea2f /sc | |
| parent | c25cb8a641723ab098980bb842caf75c0dc9b059 (diff) | |
Fixes/improvements on previous commit
* UUIInteractionHandler still needs to implement XInitialization.
* Moved ambiguating InteractionHandler typedef out of the way.
* Removed InteractionHandler.createDefault, as it was originally stated that "it
is strongly recommended that [the "Parent"] property is supplied."
* Added back documentation about Parent and Context.
* Simplified some call-sites to directly use XInteractionHandler2.
Change-Id: I1029b8f3cf079171c75920cafaaa44b5bbada883
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/dpobject.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/dapidata.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/docshell/dbdocimp.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index c3a034c4f3df..634eeb232ef7 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -3058,7 +3058,7 @@ uno::Reference<sdbc::XRowSet> ScDPCollection::DBCaches::createRowSet( if ( xExecute.is() ) { uno::Reference<task::XInteractionHandler> xHandler( - task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), + task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0), uno::UNO_QUERY_THROW); xExecute->executeWithCompletion( xHandler ); } diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 117a8e7ef668..4213ede828b4 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -165,8 +165,8 @@ void ScDataPilotDatabaseDlg::FillObjects() if ( !xSource.is() ) return; uno::Reference<task::XInteractionHandler> xHandler( - task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), - uno::UNO_QUERY_THROW); + task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0), + uno::UNO_QUERY_THROW); uno::Reference<sdbc::XConnection> xConnection = xSource->connectWithCompletion( xHandler ); diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 5b849909ef23..c3be6648b2e2 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -252,8 +252,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, if ( xExecute.is() ) { uno::Reference<task::XInteractionHandler> xHandler( - task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), - uno::UNO_QUERY_THROW); + task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0), + uno::UNO_QUERY_THROW); xExecute->executeWithCompletion( xHandler ); } else |