[Libreoffice-commits] core.git: vcl/inc vcl/unx

Chris Sherlock chris.sherlock79 at gmail.com
Wed Jan 13 14:31:02 PST 2016


 vcl/inc/fontcache.hxx                       |   89 ----------------------------
 vcl/inc/unx/fontcache.hxx                   |   89 ++++++++++++++++++++++++++++
 vcl/unx/generic/fontmanager/fontcache.cxx   |    2 
 vcl/unx/generic/fontmanager/fontconfig.cxx  |    2 
 vcl/unx/generic/fontmanager/fontmanager.cxx |    2 
 5 files changed, 92 insertions(+), 92 deletions(-)

New commits:
commit 59c5738e4d98addb271290c391435e844fd70741
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Thu Jan 14 09:30:26 2016 +1100

    vcl: fontcache.hxx is a private Unix header for psp
    
    Change-Id: I5b27a21ff49ca84400c635b6e8539c7041b117d4

diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/unx/fontcache.hxx
similarity index 100%
rename from vcl/inc/fontcache.hxx
rename to vcl/inc/unx/fontcache.hxx
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx
index 84f48f2..bd85f9b 100644
--- a/vcl/unx/generic/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -20,7 +20,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "fontcache.hxx"
+#include "unx/fontcache.hxx"
 
 #include "osl/thread.h"
 
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 531e622..6d45e87 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "fontcache.hxx"
+#include "unx/fontcache.hxx"
 #include "impfont.hxx"
 #include "fontmanager.hxx"
 #include <vcl/svapp.hxx>
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index e9a51ff..35e4889 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -25,7 +25,7 @@
 
 #include "unotools/atom.hxx"
 
-#include "fontcache.hxx"
+#include "unx/fontcache.hxx"
 #include "fontsubset.hxx"
 #include "impfontcharmap.hxx"
 #include "svdata.hxx"


More information about the Libreoffice-commits mailing list