diff options
| author | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-06-02 15:26:12 +0200 |
|---|---|---|
| committer | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-06-02 15:26:12 +0200 |
| commit | 5ad79ff63008de36accc910d474f2e85b4d8d9e1 (patch) | |
| tree | e53102eb1d03e0003486e03a83378474d624e808 /sd/source/ui/tools | |
| parent | 3660c4324cf2da169d24e8cc1e1662faedee935e (diff) | |
| parent | 38c1d35d15a0adc980c2355ff97ce327645cd954 (diff) | |
renaissance1: merge with DEV300_m80
Diffstat (limited to 'sd/source/ui/tools')
| -rw-r--r-- | sd/source/ui/tools/EventMultiplexer.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/tools/IdleDetection.cxx | 19 |
2 files changed, 9 insertions, 12 deletions
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 8d6bd5f6b4bc..81678d1af7c0 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -265,7 +265,7 @@ EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase) // Connect to the frame to listen for controllers being exchanged. // Listen to changes of certain properties. Reference<frame::XFrame> xFrame ( - mrBase.GetFrame()->GetTopFrame()->GetFrameInterface(), + mrBase.GetFrame()->GetTopFrame().GetFrameInterface(), uno::UNO_QUERY); mxFrameWeak = xFrame; if (xFrame.is()) diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index ae36f8954e56..46ac4174cbe7 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -82,18 +82,15 @@ sal_Int32 IdleDetection::CheckSlideShowRunning (void) // Ignore the current frame when it does not exist, is not valid, or // is not active. bool bIgnoreFrame (true); - if (pViewFrame->GetFrame() != NULL) + uno::Reference<frame::XFrame> xFrame (pViewFrame->GetFrame().GetFrameInterface()); + try { - uno::Reference<frame::XFrame> xFrame (pViewFrame->GetFrame()->GetFrameInterface()); - try - { - if (xFrame.is() && xFrame->isActive()) - bIgnoreFrame = false; - } - catch (uno::RuntimeException e) - { - (void) e; - } + if (xFrame.is() && xFrame->isActive()) + bIgnoreFrame = false; + } + catch (uno::RuntimeException e) + { + (void) e; } if (bIgnoreFrame) continue; |