diff options
Diffstat (limited to 'sc/source/filter/inc')
-rw-r--r-- | sc/source/filter/inc/richstring.hxx | 15 | ||||
-rw-r--r-- | sc/source/filter/inc/worksheethelper.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xestyle.hxx | 6 | ||||
-rw-r--r-- | sc/source/filter/inc/xlstyle.hxx | 6 |
4 files changed, 14 insertions, 15 deletions
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 9f15aab0470f..84a80c15c96b 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -68,16 +68,15 @@ public: /** Converts the portion and replaces or appends to the passed XText. */ void convert( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText, - - const Font* pFont, bool bReplace ); - void convert( ScEditEngineDefaulter& rEE, ESelection& rSelection, const Font* pFont ); + const oox::xls::Font* pFont, bool bReplace ); + void convert( ScEditEngineDefaulter& rEE, ESelection& rSelection, const oox::xls::Font* pFont ); void writeFontProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText, - const Font* pFont ) const; + const oox::xls::Font* pFont ) const; private: - OUString maText; /// Portion text. + OUString maText; /// Portion text. FontRef mxFont; /// Embedded portion font, may be empty. sal_Int32 mnFontId; /// Link to global font list. bool mbConverted; /// Without repeatly convert @@ -250,7 +249,7 @@ public: if there is only one unformatted portion. */ bool extractPlainString( OUString& orString, - const Font* pFirstPortionFont = 0 ) const; + const oox::xls::Font* pFirstPortionFont = 0 ) const; /** Converts the string and writes it into the passed XText. @param rxText The XText interface of the target object. @@ -260,8 +259,8 @@ public: void convert( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText, bool bReplaceOld, - const Font* pFirstPortionFont = 0 ) const; - ::EditTextObject* convert( ScEditEngineDefaulter& rEE, const Font* pFont ) const; + const oox::xls::Font* pFirstPortionFont = 0 ) const; + ::EditTextObject* convert( ScEditEngineDefaulter& rEE, const oox::xls::Font* pFont ) const; private: /** Creates, appends, and returns a new empty string portion. */ diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 37179bb5b62d..79ab96425ba7 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -283,7 +283,7 @@ public: /** Inserts a rich-string cell directly into the Calc sheet. */ void putRichString( const com::sun::star::table::CellAddress& rAddress, - const RichString& rString, const Font* pFirstPortionFont ); + const RichString& rString, const oox::xls::Font* pFirstPortionFont ); /** Inserts a formula cell directly into the Calc sheet. */ void putFormulaTokens( const com::sun::star::table::CellAddress& rAddress, const ApiTokenSequence& rTokens ); diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index 5dcc70127e0d..9d8453b64b6c 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -124,7 +124,7 @@ private: // FONT record - font information ============================================= -class Font; +namespace { class Font; } class SvxFont; const size_t EXC_FONTLIST_NOTFOUND = static_cast< size_t >( -1 ); @@ -139,7 +139,7 @@ public: const SfxItemSet& rItemSet ); /** Returns a VCL font object filled from the passed item set. */ - static Font GetFontFromItemSet( + static vcl::Font GetFontFromItemSet( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16 nScript ); @@ -218,7 +218,7 @@ public: /** Inserts the font into the buffer if not present. @param bAppFont true = Sets the application font; false = Inserts a new font. @return The resulting Excel font index. */ - sal_uInt16 Insert( const Font& rFont, + sal_uInt16 Insert( const vcl::Font& rFont, XclExpColorType eColorType, bool bAppFont = false ); /** Inserts the SvxFont into the buffer if not present, e.g. where escapements are used. @param bAppFont true = Sets the application font; false = Inserts a new font. diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index 49059cd967b1..f6b00a6590ed 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -279,7 +279,7 @@ private: // Font data ================================================================== -class Font; +namespace vcl { class Font; } class SvxFont; /** This struct helps reading and writing Excel fonts. @@ -307,14 +307,14 @@ struct XclFontData /** Constructs an empty font data structure. */ explicit XclFontData(); /** Constructs a font data structure and fills it with the passed font attributes (except color). */ - explicit XclFontData( const Font& rFont ); + explicit XclFontData( const vcl::Font& rFont ); /** As directly above but also fills in the escapement member. */ explicit XclFontData( const SvxFont& rFont ); /** Resets all members to default (empty) values. */ void Clear(); /** Fills all members (except color and escapement) from the passed font. */ - void FillFromVclFont( const Font& rFont ); + void FillFromVclFont( const vcl::Font& rFont ); /** Fills all members (except color) from the passed SVX font. */ void FillFromSvxFont( const SvxFont& rFont ); |