diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-02-01 16:15:55 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-02-01 18:18:29 +0100 |
| commit | eb70a6e126f5801f928eac1bd1123fc672e380e0 (patch) | |
| tree | 3f3a6ad35ebdaf9f201d201feb34ab012ff57ac0 /xmloff | |
| parent | 7d88c35cc3fa8b4c9ebf23800d3771a265937086 (diff) | |
Revert "temporarily disable the xmloff/vcl dependency"
This reverts commit 7bce8c2e491562873705e3e451ba66d005b22646.
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/Library_xo.mk | 1 | ||||
| -rw-r--r-- | xmloff/source/style/XMLFontAutoStylePool.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/style/XMLFontStylesContext.cxx | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index a24b6fd27812..7ffa8ba4c459 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,xo,\ svl \ tl \ utl \ + vcl \ $(gb_UWINAPI) \ )) diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index ae761fb7cb6a..0f92d66c41e9 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -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 ] ); diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index de75dfb13d73..e822fc6a9895 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -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 |