INTEGRATION: CWS ooo19126 (1.4.836); FILE MERGED

2005/09/05 14:43:32 rt 1.4.836.1: #i54170# Change license header: remove SISSL

1 files changed, 59 insertions, 49 deletions

diff --git a/vcl/aqua/inc/salatsuifontutils.hxx b/vcl/aqua/inc/salatsuifontutils.hxx
index c005ceab2e62..44e31e153db1 100644
--- a/vcl/aqua/inc/salatsuifontutils.hxx
+++ b/vcl/aqua/inc/salatsuifontutils.hxx
@@ -1,60 +1,35 @@
 /*************************************************************************
  *
- *  $RCSfile: salatsuifontutils.hxx,v $
- *
- *  $Revision: 1.4 $
- *  last change: $Author: hr $ $Date: 2003-03-27 17:57:17 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *  $RCSfile: salatsuifontutils.hxx,v $
  *
+ *  $Revision: 1.5 $
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
+ *  last change: $Author: rt $ $Date: 2005-09-09 10:32:08 $
  *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
  *
- *  Copyright: 2001 by Sun Microsystems, Inc.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  All Rights Reserved.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  Contributor(s): _______________________________________
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
  *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************/
 
@@ -99,8 +74,11 @@ extern "C" {
 // =======================================================================
 
 static const short kMacOSCharSize = sizeof(char);
-
static const short kFontFamilyNameLength = 32;
static const short kFontStyleNameLength  = 32;
-
static const long  kFontFamilyNameMemSize  = kFontFamilyNameLength * kMacOSCharSize;
+
+static const short kFontFamilyNameLength = 32;
+static const short kFontStyleNameLength  = 32;
+
+static const long  kFontFamilyNameMemSize  = kFontFamilyNameLength * kMacOSCharSize;
 static const long  kFontStyleNameMemSize   = kFontStyleNameLength  * kMacOSCharSize;
 
 // -----------------------------------------------------------------------
@@ -130,7 +108,39 @@ enum
 
 // =======================================================================
 
-typedef short ATSUIInstanceIndex;

// -----------------------------------------------------------------------

struct FontNameEncodingRecord
{
 FontPlatformCode  mnFontPlatformCode;
  FontScriptCode    mnFontScriptCode;
    FontLanguageCode  mnFontLanguageCode;
  ItemCount         mnFontItemCount;
};

typedef struct FontNameEncodingRecord   FontNameEncodingRecord;
typedef FontNameEncodingRecord         *FontNameEncodingPtr;
typedef FontNameEncodingPtr            *FontNameEncodingMatrix;

// -----------------------------------------------------------------------

struct FontNamesRecord 
{
 ATSUFontID              mnFontID;
  FontNameEncodingRecord  maFontFamilyNameEncoding;
  FontNameEncodingRecord  maFontStyleNameEncoding;
   ATSUIInstanceIndex      mnFontInstanceIndex;
   ByteOffset              mnFontStyleByteOffset;
 char                    mpFontName[ 1 ];
};

typedef struct FontNamesRecord   FontNamesRecord;
typedef FontNamesRecord         *FontNamesPtr;
typedef FontNamesPtr            *FontNamesMatrix;

// =======================================================================
+typedef short ATSUIInstanceIndex;
+
+// -----------------------------------------------------------------------
+
+struct FontNameEncodingRecord
+{
+    FontPlatformCode  mnFontPlatformCode;
+    FontScriptCode    mnFontScriptCode;
+    FontLanguageCode  mnFontLanguageCode;
+    ItemCount         mnFontItemCount;
+};
+
+typedef struct FontNameEncodingRecord   FontNameEncodingRecord;
+typedef FontNameEncodingRecord         *FontNameEncodingPtr;
+typedef FontNameEncodingPtr            *FontNameEncodingMatrix;
+
+// -----------------------------------------------------------------------
+
+struct FontNamesRecord
+{
+    ATSUFontID              mnFontID;
+    FontNameEncodingRecord  maFontFamilyNameEncoding;
+    FontNameEncodingRecord  maFontStyleNameEncoding;
+    ATSUIInstanceIndex      mnFontInstanceIndex;
+    ByteOffset              mnFontStyleByteOffset;
+    char                    mpFontName[ 1 ];
+};
+
+typedef struct FontNamesRecord   FontNamesRecord;
+typedef FontNamesRecord         *FontNamesPtr;
+typedef FontNamesPtr            *FontNamesMatrix;
+
+// =======================================================================
 
 // =======================================================================