CWS-TOOLING: integrate CWS mav44

2009-01-18 22:39:43 +0100 mav  r266467 : #i97073# the soffice file should be a shell script, adjust the plugin
2009-01-18 22:35:15 +0100 mav  r266466 : #i97073# the soffice file should be a shell script, integrate fix from hro41 cws
2009-01-16 15:32:10 +0100 mav  r266426 : #i96456# fix link resolving
2009-01-16 12:21:39 +0100 mav  r266413 : #i97073# the soffice file is no more a shell script
2009-01-16 09:58:05 +0100 mav  r266402 : #i95409# add complex test using unicode names
2009-01-15 20:27:03 +0100 mav  r266392 : #i95408# fix include list
2009-01-15 20:09:28 +0100 mav  r266390 : #i95408# deliver new header
2009-01-15 16:16:33 +0100 mav  r266382 : #i95408# rebase to m38
2009-01-15 16:11:16 +0100 mav  r266380 : #i95408# rebase to m38
2009-01-15 15:38:16 +0100 mav  r266376 : CWS-TOOLING: rebase CWS mav44 to trunk@265758 (milestone: DEV300:m38)
2009-01-14 13:23:55 +0100 mav  r266294 : #i97073# let the presentation slideshow be started in window mode in plugin
2009-01-13 17:27:52 +0100 mav  r266241 : #i95409#,#i95408# support UTF8 encoding for entry names, check the validity of the entries
2009-01-13 16:35:39 +0100 mav  r266236 : #i95408# function to check whether a zip entry name is acceptable
2009-01-13 12:00:18 +0100 mav  r266205 : #i94003# a readonly document can not be modified
2009-01-09 13:24:49 +0100 mav  r266078 : #i95951# let the title be changed
2009-01-09 11:34:49 +0100 mav  r266068 : #i80862# close the link only if was closed by the container, othewise leave it open
2009-01-08 11:30:13 +0100 mav  r265989 : #i97071# disable Toolbars during window-based slide show in ActiveX control
2009-01-08 08:23:23 +0100 mav  r265983 : #i97071# setVisible does not trigger layout in case there is not MenuBar
2009-01-06 12:39:39 +0100 mav  r265908 : #i96185# let the MediaDescriptor get the target URL
2009-01-05 08:46:45 +0100 mav  r265856 : #i93473# integrate the patch
2009-01-02 17:45:17 +0100 mav  r265845 : #i94468#,#i96456# try to follow links
2009-01-02 16:53:41 +0100 mav  r265841 : #i94468#,#i96456# use the same parsing mechanics in sharing control file and document lock file
2009-01-02 16:51:24 +0100 mav  r265839 : #i94468#,#i96456# use the same parsing mechanics in sharing control file and document lock file

2 files changed, 43 insertions, 1 deletions

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 4fbaa395b107..27b6cdb76913 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -40,9 +40,11 @@
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/SystemPointer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
 #include <vos/process.hxx>
 #include <svtools/aeitem.hxx>
 #include <svtools/urihelper.hxx>
@@ -107,7 +109,6 @@ using ::com::sun::star::animations::XAnimationNode;
 using ::com::sun::star::animations::XAnimationListener;
 using ::com::sun::star::awt::XWindow;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing;
@@ -737,6 +738,8 @@ void SAL_CALL SlideshowImpl::disposing()
         mpShowWindow = 0;
     }
 
+    setActiveXToolbarsVisible( sal_True );
+
     mbDisposed = true;
 }
 
@@ -1107,7 +1110,10 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
 
             bRet = startShowImpl( Sequence<beans::PropertyValue>(
                                       &aProperties[0], aProperties.size() ) );
+
         }
+
+        setActiveXToolbarsVisible( sal_False );
     }
     catch( Exception& e )
     {
@@ -2525,6 +2531,40 @@ void SlideshowImpl::resize( const Size& rSize )
 
 // -----------------------------------------------------------------------------
 
+void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible )
+{
+    // in case of ActiveX control the toolbars should not be visible if slide show runs in window mode
+    // actually it runs always in window mode in case of ActiveX control
+    if ( !maPresSettings.mbFullScreen && mpDocSh && mpDocSh->GetMedium() )
+    {
+        SFX_ITEMSET_ARG( mpDocSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False );
+        if ( pItem && pItem->GetValue() )
+        {
+            // this is a plugin/activex mode, no toolbars should be visible during slide show
+            // after the end of slide show they should be visible again
+            SfxViewFrame* pViewFrame = getViewFrame();
+            if( pViewFrame && pViewFrame->GetFrame() && pViewFrame->GetFrame()->GetTopFrame() )
+            {
+                try
+                {
+                    Reference< frame::XLayoutManager > xLayoutManager;
+                    Reference< beans::XPropertySet > xFrameProps( pViewFrame->GetFrame()->GetTopFrame()->GetFrameInterface(), UNO_QUERY_THROW );
+                    if ( ( xFrameProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) )
+                                >>= xLayoutManager )
+                      && xLayoutManager.is() )
+                    {
+                        xLayoutManager->setVisible( bVisible );
+                    }
+                }
+                catch( uno::Exception& )
+                {}
+            }
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
 void SAL_CALL SlideshowImpl::activate() throw (RuntimeException)
 {
     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 829d7c8151ce..b9d5506ff2f3 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -294,6 +294,8 @@ private:
 
     void resize( const Size& rSize );
 
+    void setActiveXToolbarsVisible( sal_Bool bVisible );
+
     DECL_LINK( updateHdl, Timer* );
     DECL_LINK( ReadyForNextInputHdl, Timer* );
     DECL_LINK( endPresentationHdl, void* );