diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-02-21 13:43:44 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-02-26 11:43:21 +0100 |
| commit | 381154356c15128255e313f37641f0e50145f965 (patch) | |
| tree | 6a435b01cf5f2a7b2d06da0c6632a1ad170e678f /writerfilter | |
| parent | 0d8169955a3ccfb314605c06a790919175d30de0 (diff) | |
embed also system fonts when embedding fonts in a document
Without this, only fonts that had come embedded with the document
were embedded when saving, which meant that it was impossible
to create new documents that would have any fonts embedded.
Change-Id: I3b4e87b1b3ca5ae1ccfe29d9b571b0262c568dcf
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/inc/pch/precompiled_writerfilter.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/FontTable.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 23a12997d1af..f2565ad407d3 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -209,7 +209,7 @@ #include <vcl/graph.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> -#include <vcl/temporaryfonts.hxx> +#include <vcl/embeddedfontshelper.hxx> #include <vcl/wmf.hxx> #include <vector> #include <xmloff/odffields.hxx> diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index 08aab1149b75..cb737f1edb36 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -24,7 +24,7 @@ #include <osl/file.hxx> #include <stdio.h> #include <rtl/tencinfo.h> -#include <vcl/temporaryfonts.hxx> +#include <vcl/embeddedfontshelper.hxx> #include "dmapperLoggers.hxx" @@ -251,7 +251,7 @@ EmbeddedFontHandler::~EmbeddedFontHandler() { if( !inputStream.is()) return; - OUString fileUrl = TemporaryFonts::fileUrlForFont( fontName, style ); + OUString fileUrl = EmbeddedFontsHelper::fileUrlForTemporaryFont( fontName, style ); osl::File file( fileUrl ); switch( file.open( osl_File_OpenFlag_Create | osl_File_OpenFlag_Write )) { @@ -318,7 +318,7 @@ EmbeddedFontHandler::~EmbeddedFontHandler() osl::File::remove( fileUrl ); return; } - TemporaryFonts::activateFont( fontName, fileUrl ); + EmbeddedFontsHelper::activateFont( fontName, fileUrl ); } void EmbeddedFontHandler::lcl_attribute( Id name, Value& val ) |