diff options
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/loadenv/loadenv.cxx | 3 | ||||
-rw-r--r-- | framework/source/services/desktop.cxx | 4 | ||||
-rw-r--r-- | framework/source/services/frame.cxx | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 0fb25aa126b8..30aedf341b78 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -202,6 +202,9 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const } } + // TODO IRM:UNOLOCK + // return nullptr; + return xComponent; } diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 8a91db555c14..154b327dd482 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -552,6 +552,10 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentCompone { xComponent = impl_getFrameComponent( xCurrentFrame ); } + + // TODO: IRM:UNOLOCK + //return nullptr; + return xComponent; } diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index b759e57c38f8..01c9a8ca797e 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1612,6 +1612,9 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL XFrameImpl::getComponentWindow css::uno::Reference< css::frame::XController > SAL_CALL XFrameImpl::getController() { SolarMutexGuard g; + // TODO: IRM:UNOLOCK + // TODO: not all frames should returl nullptr, since it is used wider + // return nullptr return m_xController; } |