[Libreoffice-commits] .: comphelper/inc vcl/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Fri Feb 4 18:35:50 PST 2011
comphelper/inc/comphelper/sequenceashashmap.hxx | 21 ++++-----
vcl/inc/vcl/fontmanager.hxx | 52 ++++++++++++------------
2 files changed, 36 insertions(+), 37 deletions(-)
New commits:
commit babcd2d0075e8a60825d5a87f2589f7a2ef54baa
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri Feb 4 18:35:11 2011 -0800
Remove the #include guards. The .hxx file has it's own guards.
Also add #include <vector> to work around a boost issue.
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index bff63cf..e809d6a 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,10 +32,7 @@
//_______________________________________________
// includes
-#ifndef INCLUDED_HASH_MAP
#include <boost/unordered_map.hpp>
-#define INCLUDED_HASH_MAP
-#endif
#ifndef INCLUDED_ALGORITHM
#include <algorithm>
@@ -100,7 +97,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
/** @see operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&)
*/
SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lSource);
-
+
//---------------------------------------
/** @see operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&)
*/
@@ -195,7 +192,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
@descr Its made const to prevent using of the
return value directly as an in/out parameter!
usage: myMethod(stlDequeAdapter.getAsAnyList());
-
+
@param bAsPropertyValue
switch between using of PropertyValue or NamedValue as
value type.
@@ -204,7 +201,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
contains all items of this map.
*/
const ::com::sun::star::uno::Any getAsConstAny(::sal_Bool bAsPropertyValue) const;
-
+
//---------------------------------------
/** @short return this map instance as a
sequence< Any >, which can be
@@ -217,12 +214,12 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
@param bAsPropertyValue
switch between using of PropertyValue or NamedValue as
value type.
-
+
@return A const sequence which elements of Any, which
contains all items of this map.
*/
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > getAsConstAnyList(::sal_Bool bAsPropertyValue) const;
-
+
//---------------------------------------
/** @short return this map instance to as a
NamedValue sequence, which can be
@@ -335,12 +332,12 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
@param rCheck
the map containing all items for checking.
- @return
+ @return
TRUE if all items of Rcheck could be found
in these map; FALSE otherwise.
*/
sal_Bool match(const SequenceAsHashMap& rCheck) const;
-
+
//---------------------------------------
/** @short merge all values from the given map into
this one.
@@ -353,7 +350,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
the map containing all items for the update.
*/
void update(const SequenceAsHashMap& rSource);
-
+
//---------------------------------------
/** @short can be used to generate a file dump of
the current content of this instance.
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index a4066cb..6c76eea 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -39,6 +39,8 @@
#include "com/sun/star/lang/Locale.hpp"
+#include <vector>
+
#define ATOM_FAMILYNAME 2
#define ATOM_PSNAME 3
@@ -80,7 +82,7 @@ enum type {
UltraExpanded = 9
};
}
-
+
namespace pitch
{
enum type {
@@ -110,13 +112,13 @@ enum type {
namespace family
{
enum type {
- Unknown = 0,
- Decorative = 1,
+ Unknown = 0,
+ Decorative = 1,
Modern = 2,
- Roman = 3,
- Script = 4,
- Swiss = 5,
- System = 6
+ Roman = 3,
+ Script = 4,
+ Swiss = 5,
+ System = 6
};
}
@@ -130,12 +132,12 @@ enum type {
};
}
-namespace fcstatus
+namespace fcstatus
{
-enum type {
+enum type {
istrue,
isunset,
- isfalse
+ isfalse
};
}
@@ -153,7 +155,7 @@ struct FastPrintFontInfo
{
fontID m_nID; // FontID
fonttype::type m_eType;
-
+
// font attributes
rtl::OUString m_aFamilyName;
rtl::OUString m_aStyleName;
@@ -260,14 +262,14 @@ class VCL_DLLPUBLIC PrintFontManager
boost::unordered_map< sal_Unicode, bool > m_bVerticalSubstitutions;
PrintFontMetrics() : m_bKernPairsQueried( false ) {}
-
+
bool isEmpty() const { return m_aMetrics.empty(); }
};
struct PrintFont
{
fonttype::type m_eType;
-
+
// font attributes
int m_nFamilyName; // atom
std::list< int > m_aAliases;
@@ -399,7 +401,7 @@ class VCL_DLLPUBLIC PrintFontManager
bool m_bFontconfigSuccess;
mutable std::vector< fontID > m_aOverrideFonts;
-
+
rtl::OString getAfmFile( PrintFont* pFont ) const;
rtl::OString getFontFile( PrintFont* pFont ) const;
@@ -447,18 +449,18 @@ class VCL_DLLPUBLIC PrintFontManager
since fontconfig is asked for font substitutes before OOo will check for font availability
and fontconfig will happily substitute fonts it doesn't know (e.g. "Arial Narrow" -> "DejaVu Sans Book"!)
- it becomes necessary to tell the library about all the hidden font treasures
-
+ it becomes necessary to tell the library about all the hidden font treasures
+
@returns
true if libfontconfig accepted the directory
false else (e.g. no libfontconfig found)
*/
bool addFontconfigDir(const rtl::OString& rDirectory);
-
+
static bool parseXLFD( const rtl::OString& rXLFD, XLFDEntry& rEntry );
void parseXLFD_appendAliases( const std::list< rtl::OString >& rXLFDs, std::list< XLFDEntry >& rEntries ) const;
void initFontsAlias();
-
+
bool readOverrideMetrics();
PrintFontManager();
@@ -466,17 +468,17 @@ class VCL_DLLPUBLIC PrintFontManager
public:
static PrintFontManager& get(); // one instance only
- int addFontFile( const rtl::OString& rFileName, int nFaceNum );
+ int addFontFile( const rtl::OString& rFileName, int nFaceNum );
void initialize();
// returns the number of managed fonts
int getFontCount() const { return m_aFonts.size(); }
-
+
// caution: the getFontList* methods can change the font list on demand
// depending on the pParser argument. That is getFontCount() may
// return a larger value after getFontList()
-
+
// returns the ids of all managed fonts. on pParser != NULL
// all fonttype::Builtin type fonts are not listed
// which do not occur in the PPD of pParser
@@ -503,7 +505,7 @@ public:
// get a specific fonts family name aliases
void getFontFamilyAliases( fontID nFontID ) const;
-
+
// get a specific fonts type
fonttype::type getFontType( fontID nFontID ) const
{
@@ -733,8 +735,8 @@ public:
bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
bool getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*), ImplFontOptions& rResult ) const;
- rtl::OUString Substitute( const rtl::OUString& rFontName, rtl::OUString& rMissingCodes,
- const rtl::OString& rLangAttrib, italic::type& rItalic, weight::type& rWeight,
+ rtl::OUString Substitute( const rtl::OUString& rFontName, rtl::OUString& rMissingCodes,
+ const rtl::OString& rLangAttrib, italic::type& rItalic, weight::type& rWeight,
width::type& rWidth, pitch::type& rPitch) const;
bool hasFontconfig() const { return m_bFontconfigSuccess; }
More information about the Libreoffice-commits
mailing list