Kaydet (Commit) eb70a6e1 authored tarafından Luboš Luňák's avatar Luboš Luňák

Revert "temporarily disable the xmloff/vcl dependency"

This reverts commit 7bce8c2e.
üst 7d88c35c
......@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,xo,\
svl \
tl \
utl \
vcl \
$(gb_UWINAPI) \
))
......
......@@ -25,7 +25,7 @@
#include "fonthdl.hxx"
#include <xmloff/xmlexp.hxx>
#include <xmloff/XMLFontAutoStylePool.hxx>
//#include <vcl/temporaryfonts.hxx>
#include <vcl/temporaryfonts.hxx>
#include <osl/file.hxx>
#include <com/sun/star/embed/ElementModes.hpp>
......@@ -280,7 +280,7 @@ void XMLFontAutoStylePool::exportXML()
j < SAL_N_ELEMENTS( styles );
++j )
{
OUString fileUrl = ""; //TemporaryFonts::fileUrlForFont( pEntry->GetFamilyName(), styles[ j ] );
OUString fileUrl = TemporaryFonts::fileUrlForFont( pEntry->GetFamilyName(), styles[ j ] );
if( !fontFilesMap.count( fileUrl ))
{
OUString docUrl = embedFontFile( fileUrl, styles[ j ] );
......
......@@ -26,7 +26,7 @@
#include <osl/file.hxx>
#include <rtl/logfile.hxx>
//#include <vcl/temporaryfonts.hxx>
#include <vcl/temporaryfonts.hxx>
#include <xmloff/nmspmap.hxx>
#include "xmloff/xmlnmspe.hxx"
......@@ -258,7 +258,7 @@ void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const OUString& url )
if( url.indexOf( '/' ) > -1 ) // TODO what if more levels?
storage.set( storage->openStorageElement( url.copy( 0, url.indexOf( '/' )),
::embed::ElementModes::READ ), uno::UNO_QUERY_THROW );
OUString fileUrl = ""; // TemporaryFonts::fileUrlForFont( fontName, style );
OUString fileUrl = TemporaryFonts::fileUrlForFont( fontName, style );
osl::File file( fileUrl );
switch( file.open( osl_File_OpenFlag_Create | osl_File_OpenFlag_Write ))
{
......@@ -290,7 +290,7 @@ void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const OUString& url )
osl::File::remove( fileUrl );
return;
}
// TemporaryFonts::activateFont( fontName, fileUrl );
TemporaryFonts::activateFont( fontName, fileUrl );
GetImport().NotifyEmbeddedFontRead();
}
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment