Merge branch 'Sankore-1.40' of github.com:Sankore/Sankore-3.1 into Sankore-1.40

preferencesAboutTextFull
Claudio Valerio 13 years ago
commit 9f2e033d22
  1. 14
      src/adaptors/UBSvgSubsetAdaptor.cpp

@ -1806,7 +1806,11 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::audioItemToLinkedAudio(UBGraphicsAud
} }
QString audioFileHref = audioItem->mediaFileUrl().toString(); QString audioFileHref = audioItem->mediaFileUrl().toString();
if(audioFileHref.startsWith("file://")) //on windows
if(audioFileHref.startsWith("file:///"))
audioFileHref = audioFileHref.replace("file:///" + mDocumentPath + "/","");
//mac and linux
if(audioFileHref.startsWith("file://"))
audioFileHref = audioFileHref.replace("file://" + mDocumentPath + "/",""); audioFileHref = audioFileHref.replace("file://" + mDocumentPath + "/","");
mXmlWriter.writeAttribute(nsXLink, "href", audioFileHref); mXmlWriter.writeAttribute(nsXLink, "href", audioFileHref);
mXmlWriter.writeEndElement(); mXmlWriter.writeEndElement();
@ -1833,9 +1837,13 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::videoItemToLinkedVideo(UBGraphicsVid
} }
QString videoFileHref = videoItem->mediaFileUrl().toString(); QString videoFileHref = videoItem->mediaFileUrl().toString();
if(videoFileHref.startsWith("file://")) //on windows
if(videoFileHref.startsWith("file:///"))
videoFileHref = videoFileHref.replace("file:///" + mDocumentPath + "/","");
//on mac and linux
if(videoFileHref.startsWith("file://"))
videoFileHref = videoFileHref.replace("file://" + mDocumentPath + "/",""); videoFileHref = videoFileHref.replace("file://" + mDocumentPath + "/","");
mXmlWriter.writeAttribute(nsXLink, "href", videoFileHref); mXmlWriter.writeAttribute(nsXLink, "href", videoFileHref);
mXmlWriter.writeEndElement(); mXmlWriter.writeEndElement();
} }

Loading…
Cancel
Save