summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2019-09-03 07:59:08 +0300
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-12-04 13:42:24 +0100
commitd66684e8fb35eff09564cd41ae4f81a0fa415044 (patch)
tree59f9eed77af3ec5f824c3c92ebab70a84fbd1ba8
parentb7c2932a27600213599d34155c4a0cadeca735f6 (diff)
macro: markdown places for locking document
in these places external access to document via macro/UNO is possible. Change-Id: I1cb39015831ef324d902f0b1ae1ef830e8d1e738
-rw-r--r--framework/source/loadenv/loadenv.cxx3
-rw-r--r--framework/source/services/desktop.cxx4
-rw-r--r--framework/source/services/frame.cxx3
-rw-r--r--sfx2/source/doc/objxtor.cxx5
4 files changed, 14 insertions, 1 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;
}
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 375b3919d291..cf4b159fd15e 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -885,11 +885,14 @@ void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComp
if ( _rxComponent == xOldCurrentComp )
// nothing to do
return;
+
+ // TODO IRM:UNOLOCK
+ // return;
+
// note that "_rxComponent.get() == s_xCurrentComponent.get().get()" is /sufficient/, but not
// /required/ for "_rxComponent == s_xCurrentComponent.get()".
// In other words, it's still possible that we here do something which is not necessary,
// but we should have filtered quite some unnecessary calls already.
-
#if HAVE_FEATURE_SCRIPTING
BasicManager* pAppMgr = SfxApplication::GetBasicManager();
rTheCurrentComponent = _rxComponent;