[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source vcl/aqua

[Herbert Dürr]

 cui/source/inc/numfmt.hxx        |    2 -
 vcl/aqua/source/gdi/atsfonts.hxx |   57 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 2 deletions(-)

New commits:
commit 874cc95d768256310b6009b9d392bed4ea7558bb
Author: Herbert Dürr <hdu at apache.org>
Date:   Fri Jan 3 16:03:40 2014 +0000

    #i123951# add atsfonts.hxx header file
    
    Found by: Pavel Janik <Pavel.Janik.cz>
    Patch by: Herbert Duerr <hdu at apache.org>

diff --git a/vcl/aqua/source/gdi/atsfonts.hxx b/vcl/aqua/source/gdi/atsfonts.hxx
new file mode 100644
index 0000000..e2218de
--- /dev/null
+++ b/vcl/aqua/source/gdi/atsfonts.hxx
@@ -0,0 +1,57 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#ifndef _ATSFONTS_HXX
+#define _ATSFONTS_HXX
+
+class ImplMacFontData;
+class ImplDevFontList;
+
+#include <premac.h>
+#include <ApplicationServices/ApplicationServices.h>
+#include <postmac.h>
+
+#include <map>
+
+/* This class has the responsibility of assembling a list
+   of atsui compatible fonts available on the system and
+   enabling access to that list.
+ */
+class SystemFontList
+{
+public:
+    SystemFontList();
+    ~SystemFontList();
+
+    void AnnounceFonts( ImplDevFontList& ) const;
+    ImplMacFontData* GetFontDataFromId( ATSUFontID ) const;
+
+    ATSUFontFallbacks maFontFallbacks;
+
+private:
+    typedef std::hash_map<ATSUFontID,ImplMacFontData*> MacFontContainer;
+    MacFontContainer maFontContainer;
+
+    void InitGlyphFallbacks();
+};
+
+#endif // _ATSFONTS_HXX
+
commit a84bcc9c2772f41f13f0f03b0d1dec42f3e9502a
Author: Herbert Dürr <hdu at apache.org>
Date:   Fri Jan 3 14:07:06 2014 +0000

    #i123965# fix build breaker caused by SfxTabPage forward declaration extra namespace qualifier
    
    on some platforms like XCode>=4

diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 2f51fe1..ddb6357 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -83,8 +83,6 @@ class SvxNumberFormatTabPage : public SfxTabPage
 public:
     ~SvxNumberFormatTabPage();
 
-#undef SfxTabPage
-#define SfxTabPage ::SfxTabPage
     static SfxTabPage*      Create( Window* pParent,
                                     const SfxItemSet& rAttrSet );
     static sal_uInt16*          GetRanges();