diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /sc/source/filter/inc/richstring.hxx | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'sc/source/filter/inc/richstring.hxx')
| -rw-r--r-- | sc/source/filter/inc/richstring.hxx | 15 |
1 files changed, 7 insertions, 8 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. */ |