summaryrefslogtreecommitdiff
path: root/reportdesign/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-12-06 14:15:55 +0200
committerNoel Grandin <noel@peralex.com>2012-12-06 14:16:44 +0200
commit19854e653be1dc01f5b655fca851a6e3a651a940 (patch)
treef19e921125d72db2c132742d3d0a2ea0c66cff79 /reportdesign/source
parent8909b2c384154baa2174aa53b433b12b02871e75 (diff)
fdo#46808, Adapt sdb::ErrorMessageDialog UNO service to new style
Change-Id: Iaf12324e6aa64b268555b0f4c82f04f4c0f6f123
Diffstat (limited to 'reportdesign/source')
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx4
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx2
2 files changed, 2 insertions, 4 deletions
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index cfb5cbae01e2..fa74b0922b0c 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1570,11 +1570,9 @@ bool GeometryHandler::impl_dialogFilter_nothrow( ::rtl::OUString& _out_rSelected
::dbtools::SQLExceptionInfo aErrorInfo;
uno::Reference< awt::XWindow > xInspectorWindow;
uno::Reference< lang::XMultiComponentFactory > xFactory;
- uno::Reference<lang::XMultiServiceFactory> xServiceFactory;
try
{
xFactory = m_xContext->getServiceManager();
- xServiceFactory.set(xFactory,uno::UNO_QUERY);
xInspectorWindow.set(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) ,uno::UNO_QUERY);
if ( !xCon.is() )
@@ -1627,7 +1625,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( ::rtl::OUString& _out_rSelected
}
if ( aErrorInfo.isValid() )
- ::dbtools::showError( aErrorInfo, xInspectorWindow, xServiceFactory );
+ ::dbtools::showError( aErrorInfo, xInspectorWindow, m_xContext );
return bSuccess;
}
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 6fdf61706183..336894df2913 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -1049,7 +1049,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula
}
if ( aErrorInfo.isValid() )
- ::dbtools::showError( aErrorInfo, xInspectorWindow, xServiceFactory );
+ ::dbtools::showError( aErrorInfo, xInspectorWindow, _xContext );
return bSuccess;
}