Module_tail_build.mk | 2 +- xmloff/Library_xo.mk | 1 + xmloff/source/style/XMLFontAutoStylePool.cxx | 4 ++-- xmloff/source/style/XMLFontStylesContext.cxx | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit 1a04fbd30825ebceae5209ada9d4e0726fbd00c9 Author: LuboÅ¡ LuÅák <[email protected]> Date: Fri Feb 1 18:17:39 2013 +0100 vcl before xo fixes circular vcl<->xo dependency Change-Id: I5a9eb1f48044a2d43901b40f695ea2a93c70388e diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 8ce4fb6..7bcba45 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -244,7 +244,7 @@ $(eval $(call tailbuild_serialize,\ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ writerfilter cui chartcontroller oox \ $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \ - vcl xo \ + xo vcl \ )) endif commit eb70a6e126f5801f928eac1bd1123fc672e380e0 Author: LuboÅ¡ LuÅák <[email protected]> Date: Fri Feb 1 16:15:55 2013 +0100 Revert "temporarily disable the xmloff/vcl dependency" This reverts commit 7bce8c2e491562873705e3e451ba66d005b22646. diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index a24b6fd..7ffa8ba 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 ae761fb..0f92d66 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 de75dfb..e822fc6 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
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
