Commits

Anonymous committed f35b81a

CWS-TOOLING: integrate CWS fix30autorecovery_DEV300

Comments (0)

Files changed (2)

comphelper/source/misc/mediadescriptor.cxx

 			return impl_openStreamWithPostData( xPostData );
 		}
 
-        // b) is there a reference to a file which is just being salvaged?
-        ::rtl::OUString sFileURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_SALVAGEDFILE(), ::rtl::OUString());
-		// c) finally, the last resort is the URL property
-        if ( !sFileURL.getLength() )
-            sFileURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString());
-		if (!sFileURL.getLength())
+		// b) ... or we must get it from the given URL
+		::rtl::OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString());
+		if (!sURL.getLength())
 			throw css::uno::Exception(
 					::rtl::OUString::createFromAscii("Found no URL."),
 					css::uno::Reference< css::uno::XInterface >());
 
         // Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble
-        ::rtl::OUString sNormalizedURL = impl_normalizeURL( sFileURL );
+        ::rtl::OUString sNormalizedURL = impl_normalizeURL( sURL );
 		return impl_openStreamWithURL( sNormalizedURL, bLockFile );
 	}
 #if OSL_DEBUG_LEVEL>0

scp2/source/ooo/file_library_ooo.scp

         Name = "xsec_fw.dll";
     #endif
     Dir = gid_Dir_Program;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.