Commits

obo  committed 4dbdc97

CWS-TOOLING: integrate CWS fwk102
2009-02-10 18:30:48 +0100 mav r267575 : #159157# let the hypterlink be opened in the same browser window in case of ActiveX control
2009-02-10 18:26:06 +0100 mav r267574 : #159157# let the hypterlink be opened in the same browser window in case of ActiveX control
2009-02-10 18:18:28 +0100 mav r267573 : #159157# let the hypterlink be opened in the same browser window in case of ActiveX control
2009-02-09 16:51:23 +0100 mav r267522 : #i98922# the fix from IS from native222
2009-02-09 14:48:19 +0100 os r267516 : RES_PARATR_OUTLINELEVEL added
2009-02-09 11:07:55 +0100 mav r267503 : #i97987# handle untitled documen correctly on switching to shared mode
2009-02-06 14:52:48 +0100 mav r267465 : #i98240# commit the patch
2009-02-06 13:56:09 +0100 mav r267460 : #i98206# do not get outstream ourself

  • Participants
  • Parent commits 07c4047

Comments (0)

Files changed (16)

File extensions/source/activex/main/SOActiveX.cpp

 {
 	CComVariant dummyResult;
 
-	/*
 	if( mpDispatchInterceptor )
 	{
-		mpDispatchInterceptor->ClearParent();
 		if( mpDispFrame )
 		{
 			// remove dispatch interceptor
 						 &CComVariant( pIDispDispInter ),
 						 1,
 						 &dummyResult );
-			mpDispatchInterceptor->Release();
-			mpDispatchInterceptor = NULL;
 		}
+
+		mpDispatchInterceptor->ClearParent();
+        mpDispatchInterceptor->Release();
+        mpDispatchInterceptor = NULL;
 	}
-	*/
 
 	mpDispTempFile = CComPtr< IDispatch >();
 	mbReadyForActivation = FALSE;
         }
     }
 
-	/*
 	// create dispatch interceptor
 	mpDispatchInterceptor = new CComObject< SODispatchInterceptor >();
 	mpDispatchInterceptor->AddRef();
 					  &dummyResult );
 
 	if( !SUCCEEDED( hr ) ) return hr;
-	*/
 
 	return S_OK;
 }
                               const OLECHAR* target )
 {
     CComVariant aEmpty1, aEmpty2, aEmpty3;
-    CComVariant aTarget( target );
     CComVariant aUrl( url );
+    CComVariant aTarget;
+    if ( target )
+        aTarget = CComVariant( target );
+
     return mWebBrowser2->Navigate2( &aUrl,
                                   &aEmpty1,
                                   &aTarget,

File extensions/source/activex/main/SODispatchInterceptor.cpp

 
 STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid)
 {
-	static const IID* arr[] = 
-	{
-		&IID_ISODispatchInterceptor,
-	};
+    static const IID* arr[] = 
+    {
+        &IID_ISODispatchInterceptor,
+    };
 
-	for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
-	{
+    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    {
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
-		if (InlineIsEqualGUID(*arr[i],riid))
+        if (InlineIsEqualGUID(*arr[i],riid))
 #else
-		if (::ATL::InlineIsEqualGUID(*arr[i],riid))
+        if (::ATL::InlineIsEqualGUID(*arr[i],riid))
 #endif
-			return S_OK;
-	}
-	return S_FALSE;
+            return S_OK;
+    }
+    return S_FALSE;
 }
 
 STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL,
-            									   BSTR aTargetFrameName,
-            									   long nSearchFlags,
-            									   IDispatch FAR* FAR* retVal )
+                                                   BSTR aTargetFrameName,
+                                                   long nSearchFlags,
+                                                   IDispatch FAR* FAR* retVal )
 {
-	if ( !aURL || !retVal ) return E_FAIL;
+    if ( !aURL || !retVal ) return E_FAIL;
 
-	CComVariant aTargetUrl;
-	OLECHAR* sURLMemberName = L"Complete";
-	DISPID nURLID;
-	HRESULT hr = aURL->GetIDsOfNames( IID_NULL, &sURLMemberName, 1, LOCALE_USER_DEFAULT, &nURLID );
-	if( !SUCCEEDED( hr ) ) return hr;
+    CComVariant aTargetUrl;
+    OLECHAR* sURLMemberName = L"Complete";
+    DISPID nURLID;
+    HRESULT hr = aURL->GetIDsOfNames( IID_NULL, &sURLMemberName, 1, LOCALE_USER_DEFAULT, &nURLID );
+    if( !SUCCEEDED( hr ) ) return hr;
 
-	hr = CComDispatchDriver::GetProperty( aURL, nURLID, &aTargetUrl );
-	if( !SUCCEEDED( hr ) ) return hr;
+    hr = CComDispatchDriver::GetProperty( aURL, nURLID, &aTargetUrl );
+    if( !SUCCEEDED( hr ) ) return hr;
 
-	if( aTargetUrl.vt != VT_BSTR  ) return E_FAIL;
+    if( aTargetUrl.vt != VT_BSTR  ) return E_FAIL;
 
-	USES_CONVERSION;
-	if( !strncmp( OLE2T( aTargetUrl.bstrVal ), "ftp://", 6 ) 
-	 || !strncmp( OLE2T( aTargetUrl.bstrVal ), "http://", 7 )
-	 || !strncmp( OLE2T( aTargetUrl.bstrVal ), "file://", 7 ) )
-	{
-		CComQIPtr< IDispatch, &IID_IDispatch > pIDisp( this );
-		if( pIDisp )
-		{
-			this->AddRef();
-			*retVal = pIDisp;
-		}
-	}
-	else
-	{
-		if( !m_xSlave )
-			return E_FAIL;
+    USES_CONVERSION;
+    if( !strncmp( OLE2T( aTargetUrl.bstrVal ), ".uno:OpenHyperlink", 18 ) )
+    {
+        CComQIPtr< IDispatch, &IID_IDispatch > pIDisp( this );
+        if( pIDisp )
+        {
+            this->AddRef();
+            *retVal = pIDisp;
+        }
+    }
+    else
+    {
+        if( !m_xSlave )
+        {
+            *retVal = NULL;
+            return S_OK;
+        }
 
-		CComVariant aResult;
-		CComVariant aArgs[3];
-		aArgs[0] = CComVariant( nSearchFlags );
-		aArgs[1] = CComVariant( aTargetFrameName );
-		aArgs[2] = CComVariant( aURL );
-		
-		hr = ExecuteFunc( m_xSlave, L"queryDispatch", aArgs, 3, &aResult );
-		if( !SUCCEEDED( hr ) || aResult.vt != VT_DISPATCH || aResult.pdispVal == NULL ) return E_FAIL;
+        CComVariant aResult;
+        CComVariant aArgs[3];
+        aArgs[0] = CComVariant( nSearchFlags );
+        aArgs[1] = CComVariant( aTargetFrameName );
+        aArgs[2] = CComVariant( aURL );
+        
+        hr = ExecuteFunc( m_xSlave, L"queryDispatch", aArgs, 3, &aResult );
+        if( !SUCCEEDED( hr ) || aResult.vt != VT_DISPATCH || aResult.pdispVal == NULL )
+        {
+            *retVal = NULL;
+            return S_OK;
+        }
 
-		*retVal = aResult.pdispVal;
-		/* following code is workaround for UNO bug
-		CComQIPtr< IUnknown, &IID_IUnknown > pIUnk( *retVal );
-		if( pIUnk )
-			(*retVal)->AddRef();
-		*/
-	}
+        *retVal = aResult.pdispVal;
 
-	return S_OK;
+        CComQIPtr< IUnknown, &IID_IUnknown > pIUnk( *retVal );
+        if( pIUnk )
+            (*retVal)->AddRef();
+    }
+
+    return S_OK;
 }
 
 STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts, SAFEARRAY FAR* FAR* retVal)
 {
-	if ( !aDescripts || !retVal || SafeArrayGetDim( aDescripts ) != 1 ) 
-		return E_FAIL;
-	
-	long nLB, nUB;
+    if ( !aDescripts || !retVal || SafeArrayGetDim( aDescripts ) != 1 ) 
+        return E_FAIL;
+    
+    long nLB, nUB;
 
-	HRESULT hr = SafeArrayGetLBound( aDescripts, 1, &nLB );
-	if( !SUCCEEDED( hr ) ) return hr;
+    HRESULT hr = SafeArrayGetLBound( aDescripts, 1, &nLB );
+    if( !SUCCEEDED( hr ) ) return hr;
 
-	hr = SafeArrayGetUBound( aDescripts, 1, &nUB );
-	if( !SUCCEEDED( hr ) ) return hr;
-	if( nUB <= nLB ) return E_FAIL;
+    hr = SafeArrayGetUBound( aDescripts, 1, &nUB );
+    if( !SUCCEEDED( hr ) ) return hr;
+    if( nUB < nLB ) return E_FAIL;
 
-	*retVal = SafeArrayCreateVector( VT_DISPATCH, 0, nUB - nLB );
+    *retVal = SafeArrayCreateVector( VT_DISPATCH, 0, nUB - nLB );
 
-	for ( long ind = nLB; ind < nUB; ind ++ )
-	{
-		CComPtr<IDispatch> pElem;
-		SafeArrayGetElement( aDescripts, &ind, pElem );
-		if( pElem )
-		{
-			OLECHAR* pMemberNames[3] = { L"FeatureURL", L"FrameName", L"SearchFlags" };
-			CComVariant pValues[3];
-			hr = GetPropertiesFromIDisp( pElem, pMemberNames, pValues, 3 );
-			if( !SUCCEEDED( hr ) ) return hr;
-			if( pValues[0].vt != VT_DISPATCH || pValues[0].pdispVal == NULL
-			 || pValues[1].vt != VT_BSTR || pValues[2].vt != VT_I4 )
-				return E_FAIL;
+    for ( long ind = nLB; ind <= nUB; ind ++ )
+    {
+        CComPtr<IDispatch> pElem;
+        SafeArrayGetElement( aDescripts, &ind, pElem );
+        if( pElem )
+        {
+            OLECHAR* pMemberNames[3] = { L"FeatureURL", L"FrameName", L"SearchFlags" };
+            CComVariant pValues[3];
+            hr = GetPropertiesFromIDisp( pElem, pMemberNames, pValues, 3 );
+            if( !SUCCEEDED( hr ) ) return hr;
+            if( pValues[0].vt != VT_DISPATCH || pValues[0].pdispVal == NULL
+             || pValues[1].vt != VT_BSTR || pValues[2].vt != VT_I4 )
+                return E_FAIL;
 
-			CComPtr<IDispatch> aRes;
-			hr = queryDispatch( pValues[0].pdispVal, pValues[1].bstrVal, pValues[2].lVal, &aRes );
-			SafeArrayPutElement( *retVal, &ind, aRes );
-		}
-	}
+            CComPtr<IDispatch> aRes;
+            hr = queryDispatch( pValues[0].pdispVal, pValues[1].bstrVal, pValues[2].lVal, &aRes );
+            SafeArrayPutElement( *retVal, &ind, aRes );
+        }
+    }
 
-	return S_OK;
+    return S_OK;
 }
 
         
-STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR* /*aArgs*/)
+STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR* aArgs)
 {
-	// get url from aURL
-	OLECHAR* pUrlName = L"Complete";
-	CComVariant pValue;
-	HRESULT hr = GetPropertiesFromIDisp( aURL, &pUrlName, &pValue, 1 );
-	if( !SUCCEEDED( hr ) ) return hr;
-	if( pValue.vt != VT_BSTR || pValue.bstrVal == NULL )
-		return E_FAIL;
+    // get url from aURL
+    OLECHAR* pUrlName = L"Complete";
+    CComVariant pValue;
+    HRESULT hr = GetPropertiesFromIDisp( aURL, &pUrlName, &pValue, 1 );
+    if( !SUCCEEDED( hr ) ) return hr;
+    if( pValue.vt != VT_BSTR || pValue.bstrVal == NULL )
+        return E_FAIL;
 
-	EnterCriticalSection( &mMutex );
-	if( m_xParentControl )
-	{
-		// call GetUrl to the browser instance
-		m_xParentControl->GetURL( pValue.bstrVal, L"_blank" );
-	}
-	LeaveCriticalSection( &mMutex ); 
+    USES_CONVERSION;
+    if( !strncmp( OLE2T( pValue.bstrVal ), ".uno:OpenHyperlink", 18 ) )
+    {
+        long nLB = 0, nUB = 0;
+		// long nDim = SafeArrayGetDim( aArgs );
 
-	return S_OK;
+        hr = SafeArrayGetLBound( aArgs, 1, &nLB );
+        if( !SUCCEEDED( hr ) ) return hr;
+
+        hr = SafeArrayGetUBound( aArgs, 1, &nUB );
+        if( !SUCCEEDED( hr ) ) return hr;
+        if( nUB < nLB ) return E_FAIL;
+
+        for ( long ind = nLB; ind <= nUB; ind ++ )
+        {
+			CComVariant pVarElem;
+            SafeArrayGetElement( aArgs, &ind, &pVarElem );
+            if( pVarElem.vt == VT_DISPATCH && pVarElem.pdispVal != NULL )
+            {
+                OLECHAR* pMemberNames[2] = { L"Name", L"Value" };
+                CComVariant pValues[2];
+                hr = GetPropertiesFromIDisp( pVarElem.pdispVal, pMemberNames, pValues, 2 );
+                if( !SUCCEEDED( hr ) ) return hr;
+
+                if( pValues[0].vt == VT_BSTR && pValues[1].vt == VT_BSTR )
+                {
+                    USES_CONVERSION;
+                    if( !strncmp( OLE2T( pValues[0].bstrVal ), "URL", 3 ) )
+                    {
+                        EnterCriticalSection( &mMutex );
+                        if( m_xParentControl )
+                        {
+                            // call GetUrl to the browser instance
+                            m_xParentControl->GetURL( pValues[1].bstrVal, L"_self" );
+                        }
+                        LeaveCriticalSection( &mMutex );
+
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    return S_OK;
 }
         
 STDMETHODIMP SODispatchInterceptor::addStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/)
 {
-	// not implemented
-	return S_OK;
+    // not implemented
+    return S_OK;
 }
        
 STDMETHODIMP SODispatchInterceptor::removeStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/)
 {
-	// not implemented
-	return S_OK;
+    // not implemented
+    return S_OK;
 }
        
 STDMETHODIMP SODispatchInterceptor::getInterceptedURLs( SAFEARRAY FAR* FAR* pVal )
 {
-	*pVal = SafeArrayCreateVector( VT_BSTR, 0, 3 );
+    *pVal = SafeArrayCreateVector( VT_BSTR, 0, 3 );
 
-	if( !*pVal )
-		return E_FAIL;
+    if( !*pVal )
+        return E_FAIL;
 
-	long ix = 0;
+    long ix = 0;
     CComBSTR aPattern( OLESTR( "ftp://*" ) );
-	SafeArrayPutElement( *pVal, &ix, aPattern );
+    SafeArrayPutElement( *pVal, &ix, aPattern );
 
-	ix = 1;
+    ix = 1;
     aPattern = CComBSTR( OLESTR( "http://*" ) );
-	SafeArrayPutElement( *pVal, &ix, aPattern );
+    SafeArrayPutElement( *pVal, &ix, aPattern );
 
-	ix = 2;
+    ix = 2;
     aPattern = CComBSTR( OLESTR( "file://*" ) );
-	SafeArrayPutElement( *pVal, &ix, aPattern );
+    SafeArrayPutElement( *pVal, &ix, aPattern );
 
-	return S_OK;
+    return S_OK;
 }
 
 

File scp2/source/calc/registryitem_calc.scp

     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
+    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
     Styles = (PATCH);
 End
 
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
+    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
     Styles = (PATCH);
 End
 

File scp2/source/draw/registryitem_draw.scp

     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
+    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
     Styles = (PATCH);
 End
 
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
+    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
     Styles = (PATCH);
 End
 

File scp2/source/impress/registryitem_impress.scp

     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
+    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
     Styles = (PATCH);
 End
 
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
+    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
     Styles = (PATCH);
 End
 

File scp2/source/math/registryitem_math.scp

     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
+    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
     Styles = (PATCH);
 End
 
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
+    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
     Styles = (PATCH);
 End
 

File scp2/source/writer/registryitem_writer.scp

     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
+    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
     Styles = (PATCH);
 End
 
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
+    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
     Styles = (PATCH);
 End
 

File sd/source/ui/docshell/docshel4.cxx

 {
     SfxStringItem   aStrItem( SID_FILE_NAME, rBookmarkURL );
     SfxStringItem   aReferer( SID_REFERER, GetMedium()->GetName() );
-    SfxBoolItem     aBrowseItem( SID_BROWSE, TRUE );
-
-	( mpViewShell ? mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetDispatcher()->
-		Execute(SID_OPENDOC, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aStrItem, &aBrowseItem, &aReferer, 0L );
+	const SfxPoolItem* ppArgs[] = { &aStrItem, &aReferer, 0 };
+	( mpViewShell ? mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings().Execute( SID_OPENHYPERLINK, ppArgs );
 }
 
 } // end of namespace sd

File sfx2/source/control/bindings.cxx

 
     if ( pCache && pCache->GetDispatch().is() )
     {
+		DBG_ASSERT( !ppInternalArgs, "Internal args get lost when dispatched!" );
+
+		SfxItemPool &rPool = GetDispatcher()->GetFrame()->GetObjectShell()->GetPool();
+		SfxRequest aReq( nId, nCallMode, rPool );
+		aReq.SetModifier( nModi );
+		if( ppItems )
+			while( *ppItems )
+				aReq.AppendItem( **ppItems++ );
+
         // cache binds to an external dispatch provider
-        pCache->Dispatch( nCallMode == SFX_CALLMODE_SYNCHRON );
+        pCache->Dispatch( aReq.GetArgs(), nCallMode == SFX_CALLMODE_SYNCHRON );
         if ( bDeleteCache )
             DELETEZ( pCache );
         SfxPoolItem *pVoid = new SfxVoidItem( nId );

File sfx2/source/control/statcach.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: statcach.cxx,v $
- * $Revision: 1.36 $
+ * $Revision: 1.36.180.1 $
  *
  * This file is part of OpenOffice.org.
  *
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/FrameActionEvent.hpp>
 #include <com/sun/star/frame/FrameAction.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/weak.hxx>
 #include <svtools/eitem.hxx>
 #include <svtools/intitem.hxx>
 #endif
 
 #include <sfx2/app.hxx>
+#include <sfx2/appuno.hxx>
 #include "statcach.hxx"
 #include <sfx2/msg.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/viewfrm.hxx>
 
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 
 	return aStatus;
 }
 
-void BindDispatch_Impl::Dispatch( sal_Bool bForceSynchron )
+void BindDispatch_Impl::Dispatch( uno::Sequence < beans::PropertyValue > aProps, sal_Bool bForceSynchron )
 {
     if ( xDisp.is() && aStatus.IsEnabled )
     {
-        ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aProps(1);
-        aProps.getArray()[0].Name = DEFINE_CONST_UNICODE("SynchronMode");
-        aProps.getArray()[0].Value <<= bForceSynchron ;
+		sal_Int32 nLength = aProps.getLength();
+        aProps.realloc(nLength+1);
+        aProps[nLength].Name = DEFINE_CONST_UNICODE("SynchronMode");
+        aProps[nLength].Value <<= bForceSynchron ;
         xDisp->dispatch( aURL, aProps );
     }
 }
 	return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > ();
 }
 
-void SfxStateCache::Dispatch( sal_Bool bForceSynchron )
+void SfxStateCache::Dispatch( const SfxItemSet* pSet, sal_Bool bForceSynchron )
 {
 	// protect pDispatch against destruction in the call
 	::com::sun::star::uno::Reference < ::com::sun::star::frame::XStatusListener > xKeepAlive( pDispatch );
 	if ( pDispatch )
-        pDispatch->Dispatch( bForceSynchron );
+	{
+		uno::Sequence < beans::PropertyValue > aArgs;
+		if (pSet)
+			TransformItems( nId, *pSet, aArgs );
+        pDispatch->Dispatch( aArgs, bForceSynchron );
+	}
 }
 
 

File sfx2/source/doc/docfile.cxx

             }
 
             // TODO/LATER: This implementation does not allow to detect the system lock on saving here, actually this is no big problem
-            if ( bUseSystemLock && !pImp->xStream.is() && !pOutStream )
+            if ( bLoading && bUseSystemLock && !pImp->xStream.is() && !pOutStream )
                 pImp->m_bHandleSysLocked = sal_True; // if system lock is used the writeable stream should be available
 
             do

File sfx2/source/doc/objmisc.cxx

 
     if ( bShared != IsDocShared() )
     {
+        ::rtl::OUString aOrigURL = GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
+
+        if ( !aOrigURL.getLength() && bSave )
+        {
+            // this is a new document, let it be stored before switching to the shared mode;
+            // the storing should be done without shared flag, since it is possible that the
+            // target location does not allow to create sharing control file;
+            // the shared flag will be set later after creation of sharing control file
+            SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst( this );
+
+            if ( pViewFrame )
+            {
+                // TODO/LATER: currently the application guards against the reentrance problem
+				const SfxPoolItem* pItem = pViewFrame->GetBindings().ExecuteSynchron( HasName() ? SID_SAVEDOC : SID_SAVEASDOC );
+                SfxBoolItem* pResult = PTR_CAST( SfxBoolItem, pItem );
+                bResult = ( pResult && pResult->GetValue() );
+                if ( bResult )
+                    aOrigURL = GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
+            }
+        }
+
         sal_Bool bOldValue = HasSharedXMLFlagSet();
         SetSharedXMLFlag( bShared );
 
-        ::rtl::OUString aOrigURL = GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
         sal_Bool bRemoveEntryOnError = sal_False;
         if ( bResult && bShared )
         {
             if ( pViewFrame )
             {
                 // TODO/LATER: currently the application guards against the reentrance problem
+                SetModified( sal_True ); // the modified flag has to be set to let the document be stored with the shared flag
 				const SfxPoolItem* pItem = pViewFrame->GetBindings().ExecuteSynchron( HasName() ? SID_SAVEDOC : SID_SAVEASDOC );
                 SfxBoolItem* pResult = PTR_CAST( SfxBoolItem, pItem );
                 bResult = ( pResult && pResult->GetValue() );

File sfx2/source/doc/objserv.cxx

     {
         *pState = SIGNATURESTATE_NOSIGNATURES;
 
-        if ( GetMedium() && GetMedium()->GetName().Len() && GetMedium()->GetStorage().is() && IsOwnStorageFormat_Impl( *GetMedium()) )
+        if ( GetMedium() && GetMedium()->GetName().Len() && IsOwnStorageFormat_Impl( *GetMedium())  && GetMedium()->GetStorage().is() )
         {
 			try
 			{

File sfx2/source/doc/objstor.cxx

     else
     {
         // This is SaveAs or export action, prepare the target medium
+        // the alien filters still might write directly to the file, that is of course a bug,
+        // but for now the framework has to be ready for it
+        // TODO/LATER: let the medium be prepared for alien formats as well
         rMedium.CloseAndRelease();
         if ( bStorageBasedTarget )
         {
             rMedium.GetOutputStorage();
         }
-        else
-        {
-            rMedium.CreateTempFileNoCopy();
-            rMedium.GetOutStream();
-        }
     }
 
     // TODO/LATER: error handling

File sfx2/source/inc/statcach.hxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: statcach.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.180.1 $
  *
  * This file is part of OpenOffice.org.
  *
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
 #include <com/sun/star/frame/DispatchDescriptor.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/weak.hxx>
 
 #ifndef _SFXBINDINGS_HXX
 
 	void					Release();
 	const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const;
-    void                    Dispatch( sal_Bool bForceSynchron = sal_False );
+	void                    Dispatch( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aProps, sal_Bool bForceSynchron = sal_False );
 };
 
 class SfxStateCache
     const SfxSlotServer*    GetSlotServer( SfxDispatcher &rDispat )
                             { return GetSlotServer( rDispat, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > () ); }
 	::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > 			GetDispatch() const;
-    void                    Dispatch( sal_Bool bForceSynchron = sal_False );
+    void                    Dispatch( const SfxItemSet* pSet, sal_Bool bForceSynchron = sal_False );
 	sal_Bool					IsControllerDirty() const
 							{ return bCtrlDirty ? sal_True : sal_False; }
 	SfxPoolItem*			GetItem() const { return pLastItem; }

File sw/source/filter/html/css1atr.cxx

 /* RES_PARATR_VERTALIGN */          0, // new
 /* RES_PARATR_SNAPTOGRID*/          0, // new
 /* RES_PARATR_CONNECT_TO_BORDER */  0, // new
+/* RES_PARATR_OUTLINELEVEL */       0, // new since cws outlinelevel
 
 /* RES_PARATR_LIST_ID */            0, // new
 /* RES_PARATR_LIST_LEVEL */         0, // new