[Libreoffice-commits] .: xmloff/Library_xo.mk xmloff/source

[Luboš Luňák]

 xmloff/Library_xo.mk                         |    1 -
 xmloff/source/style/XMLFontAutoStylePool.cxx |    4 ++--
 xmloff/source/style/XMLFontStylesContext.cxx |    6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 7bce8c2e491562873705e3e451ba66d005b22646
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Feb 1 16:14:31 2013 +0100

    temporarily disable the xmloff/vcl dependency
    
    As far as I can tell, there is not circular dependency, but make
    complains, and only when invoked from toplevel, not from tail_build.
    Looks like gbuild problem, but do a hackish change to make
    unbreak clean compilation, for now.
    
    Change-Id: I445ba343f9eaa988c60c288bf5fc1c5d1c7b67a5

diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 7ffa8ba..a24b6fd 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -50,7 +50,6 @@ $(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 0f92d66..ae761fb 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 e822fc6..de75dfb 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