Author: hdu
Date: Fri Jan 3 12:29:09 2014
New Revision: 1555073
URL: http://svn.apache.org/r1555073
Log:
#i123951# prepare ATSUI code parts for its new CoreText cousin
Added:
openoffice/trunk/main/vcl/aqua/source/gdi/atsfonts.cxx
- copied, changed from r1554849,
openoffice/trunk/main/vcl/aqua/source/gdi/salatsuifontutils.cxx
openoffice/trunk/main/vcl/aqua/source/gdi/atslayout.cxx
- copied, changed from r1554774,
openoffice/trunk/main/vcl/aqua/source/gdi/salatslayout.cxx
openoffice/trunk/main/vcl/aqua/source/gdi/atslayout.hxx
- copied unchanged from r1554774,
openoffice/trunk/main/vcl/inc/aqua/salatsuifontutils.hxx
Removed:
openoffice/trunk/main/vcl/aqua/source/gdi/salatslayout.cxx
openoffice/trunk/main/vcl/aqua/source/gdi/salatsuifontutils.cxx
openoffice/trunk/main/vcl/inc/aqua/salatsuifontutils.hxx
Modified:
openoffice/trunk/main/vcl/Library_vcl.mk
openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx
Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1555073&r1=1555072&r2=1555073&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Fri Jan 3 12:29:09 2014
@@ -161,8 +161,8 @@ $(eval $(call gb_Library_add_exception_o
vcl/aqua/source/dtrans/PictToBmpFlt \
vcl/aqua/source/dtrans/aqua_clipboard \
vcl/aqua/source/dtrans/service_entry \
- vcl/aqua/source/gdi/salatslayout \
- vcl/aqua/source/gdi/salatsuifontutils \
+ vcl/aqua/source/gdi/atslayout \
+ vcl/aqua/source/gdi/atsfonts \
vcl/aqua/source/gdi/salbmp \
vcl/aqua/source/gdi/salcolorutils \
vcl/aqua/source/gdi/salgdi \
Copied: openoffice/trunk/main/vcl/aqua/source/gdi/atsfonts.cxx (from r1554849,
openoffice/trunk/main/vcl/aqua/source/gdi/salatsuifontutils.cxx)
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/atsfonts.cxx?p2=openoffice/trunk/main/vcl/aqua/source/gdi/atsfonts.cxx&p1=openoffice/trunk/main/vcl/aqua/source/gdi/salatsuifontutils.cxx&r1=1554849&r2=1555073&rev=1555073&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/salatsuifontutils.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/atsfonts.cxx Fri Jan 3 12:29:09
2014
@@ -32,7 +32,7 @@
#include "aqua/salgdi.h"
#include "aqua/saldata.hxx"
-#include "aqua/salatsuifontutils.hxx"
+#include "atsfonts.hxx"
#include "impfont.hxx"
// -----------------------------------------------------------------------
Copied: openoffice/trunk/main/vcl/aqua/source/gdi/atslayout.cxx (from r1554774,
openoffice/trunk/main/vcl/aqua/source/gdi/salatslayout.cxx)
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/atslayout.cxx?p2=openoffice/trunk/main/vcl/aqua/source/gdi/atslayout.cxx&p1=openoffice/trunk/main/vcl/aqua/source/gdi/salatslayout.cxx&r1=1554774&r2=1555073&rev=1555073&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/salatslayout.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/atslayout.cxx Fri Jan 3 12:29:09
2014
@@ -25,7 +25,7 @@
#include "aqua/saldata.hxx"
#include "aqua/salgdi.h"
-#include "aqua/salatsuifontutils.hxx"
+#include "atsfonts.hxx"
#include "sallayout.hxx"
#include "salgdi.hxx"
Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1555073&r1=1555072&r2=1555073&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx Fri Jan 3 12:29:09
2014
@@ -46,7 +46,7 @@
#include "aqua/salbmp.h"
#include "aqua/salframe.h"
#include "aqua/salcolorutils.hxx"
-#include "aqua/salatsuifontutils.hxx"
+#include "atsfonts.hxx"
#include "fontsubset.hxx"
#include "impfont.hxx"
