vcl/Library_vclplug_gen.mk | 2 vcl/unx/generic/gdi/font.cxx | 166 ++++++++++++++++++++++++++++++++ vcl/unx/generic/gdi/salgdi3.cxx | 202 ---------------------------------------- 3 files changed, 167 insertions(+), 203 deletions(-)
New commits: commit 6edecb49c0b2e16df58a79b4b93c24567bfaafac Author: Chris Sherlock <[email protected]> Date: Tue Jan 26 00:13:56 2016 +1100 vcl: rename Unix salgdi3.cxx to font.cxx Change-Id: I201f8e5281332ae9668f59060ea2a94f211a7c68 diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 79bd353..859bc98 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -96,7 +96,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/gdi/openglx11cairotextrender \ vcl/unx/generic/gdi/salbmp \ vcl/unx/generic/gdi/salgdi2 \ - vcl/unx/generic/gdi/salgdi3 \ + vcl/unx/generic/gdi/font \ vcl/unx/generic/gdi/salgdi \ vcl/unx/generic/gdi/salvd \ vcl/unx/generic/gdi/xrender_peer \ diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/font.cxx similarity index 100% rename from vcl/unx/generic/gdi/salgdi3.cxx rename to vcl/unx/generic/gdi/font.cxx commit 2e17e1510291a56ebb49da4c606f8b5ba2b3608e Author: Chris Sherlock <[email protected]> Date: Tue Jan 26 00:11:08 2016 +1100 vcl: remove comment cruft from vcl/unx/generic/gdi/salgdi3.cxx Change-Id: Iaa325c3404cf44b6ca98041fd2c904e77d7535d2 diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 1e83174..e0ca042 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -25,8 +25,6 @@ #include "unx/salvd.h" #include "textrender.hxx" -// X11SalGraphics - GC X11SalGraphics::GetFontGC() { commit f067298b905fc3fc5d6d8aa70f05c30226e55e36 Author: Chris Sherlock <[email protected]> Date: Tue Jan 26 00:10:18 2016 +1100 vcl: remove unneeded headers from vcl/unx/generic/gdi/salgdi3.cxx Change-Id: I52089c8a74d94ebf82c2ca57d530638ce3e118da diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 11a5030..1e83174 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -17,47 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sal/types.h> - -#include <string.h> -#include <math.h> -#include <unistd.h> -#include <fcntl.h> -#include <fontconfig/fontconfig.h> -#include <sys/mman.h> -#include <sys/stat.h> -#include <sys/types.h> - -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <i18nlangtag/mslangid.hxx> -#include <osl/file.hxx> -#include <osl/module.hxx> -#include <rtl/tencinfo.h> -#include <tools/stream.hxx> -#include <vcl/settings.hxx> #include <vcl/sysdata.hxx> -#include <vcl/jobdata.hxx> -#include <vcl/printerinfomanager.hxx> -#include <vcl/svapp.hxx> -#include <vcl/metric.hxx> #include <vcl/fontcharmap.hxx> -#include "unx/fontmanager.hxx" -#include "impfont.hxx" -#include "gcach_xpeer.hxx" -#include "unx/genpspgraphics.h" -#include "unx/printergfx.hxx" -#include "outdev.h" -#include "PhysicalFontCollection.hxx" -#include "PhysicalFontFace.hxx" -#include "salframe.hxx" -#include "unx/saldata.hxx" #include "unx/saldisp.hxx" #include "unx/salgdi.h" -#include "unx/salunx.h" #include "unx/salvd.h" #include "textrender.hxx" -#include "xrender_peer.hxx" // X11SalGraphics _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
