Attachment 173341 Details for Bug 253518 – This might be the solution, need to be able to reproduce it to be sure

[patch] This might be the solution, need to be able to reproduce it to be sure

workspace.fwk55.patch (text/plain), 2.77 KB, created by Caolan McNamara on 2007-08-27 07:33:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2007-08-27 07:33:07 UTC

Size: 2.77 KB

patch

obsolete

>Index: framework/sfx2/source/doc/objuno.cxx
>diff -u framework/sfx2/source/doc/objuno.cxx:1.28 framework/sfx2/source/doc/objuno.cxx:1.28.40.1
>--- framework/sfx2/source/doc/objuno.cxx:1.28	Sun Sep 17 09:43:51 2006
>+++ framework/sfx2/source/doc/objuno.cxx	Wed Oct 25 02:38:20 2006
>@@ -1156,11 +1156,19 @@
> 
> uno::Reference< embed::XStorage > SfxStandaloneDocumentInfoObject::GetStorage_Impl( const ::rtl::OUString& rName, sal_Bool bWrite )
> {
>+    // catch unexpected exceptions under solaris
>+    // Client code checks the returned reference but is not interested on error details.
>+    try
>+    {
> 	return ::comphelper::OStorageHelper::GetStorageFromURL(
> 						rName, 
> 						bWrite ? embed::ElementModes::READWRITE : embed::ElementModes::READ,
> 						_xFactory );
>-
>+    }
>+    catch(const uno::Exception&)
>+    {}
>+    
>+    return uno::Reference< embed::XStorage >();
> 
> 	// The medium should not be used here any more
> 	// Medium erstellen
>Index: framework/sfx2/source/doc/sfxbasemodel.cxx
>diff -u framework/sfx2/source/doc/sfxbasemodel.cxx:1.117 framework/sfx2/source/doc/sfxbasemodel.cxx:1.117.8.1
>--- framework/sfx2/source/doc/sfxbasemodel.cxx:1.117	Thu Oct 12 08:56:47 2006
>+++ framework/sfx2/source/doc/sfxbasemodel.cxx	Fri Oct 20 03:59:37 2006
>@@ -1170,7 +1170,7 @@
> 	if ( m_pData->m_pObjectShell.Is() )
> 	{
> 		m_pData->m_sURL = rURL;
>-		m_pData->m_seqArguments = uno::Sequence< beans::PropertyValue >( rArgs.getLength() );
>+		uno::Sequence< beans::PropertyValue > aNewSeqArgs( rArgs.getLength() );
> 		sal_Int32 nNewLen = 0;
> 
> 		for ( sal_Int32 nInd = 0; nInd < rArgs.getLength(); nInd++ )
>@@ -1194,11 +1194,13 @@
> 			else if ( !rArgs[nInd].Name.equalsAscii( "Stream" ) && !rArgs[nInd].Name.equalsAscii( "InputStream" ) )
> 			{
> 				// TODO/LATER: all the parameters that are accepted by ItemSet of the DocShell must be ignored here
>-				m_pData->m_seqArguments[nNewLen++] = rArgs[nInd];
>+				aNewSeqArgs[nNewLen++] = rArgs[nInd];
> 			}
> 		}
> 
>-		m_pData->m_seqArguments.realloc( nNewLen );
>+		aNewSeqArgs.realloc( nNewLen );
>+
>+		m_pData->m_seqArguments = aNewSeqArgs;
> 
> 		if( m_pData->m_pObjectShell->GetMedium() )
> 		{
>Index: util/tools/source/stream/stream.cxx
>diff -u util/tools/source/stream/stream.cxx:1.24 util/tools/source/stream/stream.cxx:1.24.22.1
>--- util/tools/source/stream/stream.cxx:1.24	Sat Sep 16 18:01:33 2006
>+++ util/tools/source/stream/stream.cxx	Mon Oct 23 05:56:08 2006
>@@ -1159,7 +1159,19 @@
> sal_Size SvStream::SeekRel( sal_sSize nPos )
> {
>     sal_Size nActualPos = Tell();
>-    nActualPos += nPos;
>+
>+	if ( nPos >= 0 )
>+	{
>+		if ( SAL_MAX_SIZE - nActualPos > (sal_Size)nPos )
>+    		nActualPos += nPos;
>+	}
>+	else
>+	{
>+		sal_Size nAbsPos = (sal_Size)-nPos;
>+		if ( nActualPos >= nAbsPos )
>+			nActualPos -= nAbsPos;
>+	}
>+
>     pBufPos = pRWBuf + nActualPos;
>     return Seek( nActualPos );
> }

Actions: View | Diff

Attachments on bug 253518: 173341