summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/xecontent.cxx2
-rw-r--r--sc/source/filter/excel/xehelper.cxx2
-rw-r--r--sc/source/filter/excel/xestyle.cxx10
-rw-r--r--sc/source/filter/excel/xistyle.cxx2
-rw-r--r--sc/source/filter/excel/xlroot.cxx2
-rw-r--r--sc/source/filter/excel/xlstyle.cxx4
-rw-r--r--sc/source/filter/inc/richstring.hxx15
-rw-r--r--sc/source/filter/inc/worksheethelper.hxx2
-rw-r--r--sc/source/filter/inc/xestyle.hxx6
-rw-r--r--sc/source/filter/inc/xlstyle.hxx6
-rw-r--r--sc/source/filter/oox/richstring.cxx14
-rw-r--r--sc/source/filter/oox/sheetdatabuffer.cxx2
-rw-r--r--sc/source/filter/oox/unitconverter.cxx2
-rw-r--r--sc/source/filter/oox/worksheethelper.cxx2
14 files changed, 35 insertions, 36 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 7e395364732b..168e45209c58 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -630,7 +630,7 @@ XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rF
mbFontUsed = mbHeightUsed || mbWeightUsed || mbColorUsed || mbUnderlUsed || mbItalicUsed || mbStrikeUsed;
if( mbFontUsed )
{
- Font aFont;
+ vcl::Font aFont;
ScPatternAttr::GetFont( aFont, rItemSet, SC_AUTOCOL_RAW );
maFontData.FillFromVclFont( aFont );
mnFontColorId = GetPalette().InsertColor( maFontData.maColor, EXC_COLOR_CELLTEXT );
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 00719de8c455..79da723f7a40 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -722,7 +722,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
// --- font attributes ---
- Font aFont;
+ vcl::Font aFont;
aItemSet.ClearItem();
SfxItemSet aEditSet( mrEE.GetAttribs( aSel ) );
ScPatternAttr::GetFromEditItemSet( aItemSet, aEditSet );
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 94c99f700c1f..6a59547c1eca 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -872,7 +872,7 @@ sal_Int16 XclExpFontHelper::GetFirstUsedScript( const XclExpRoot& rRoot, const S
return nScript;
}
-Font XclExpFontHelper::GetFontFromItemSet( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16 nScript )
+vcl::Font XclExpFontHelper::GetFontFromItemSet( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16 nScript )
{
namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
@@ -891,7 +891,7 @@ Font XclExpFontHelper::GetFontFromItemSet( const XclExpRoot& rRoot, const SfxIte
}
// fill the font object
- Font aFont;
+ vcl::Font aFont;
ScPatternAttr::GetFont( aFont, rItemSet, SC_AUTOCOL_RAW, 0, 0, 0, nScScript );
return aFont;
}
@@ -1078,7 +1078,7 @@ sal_uInt16 XclExpFontBuffer::Insert(
}
sal_uInt16 XclExpFontBuffer::Insert(
- const Font& rFont, XclExpColorType eColorType, bool bAppFont )
+ const vcl::Font& rFont, XclExpColorType eColorType, bool bAppFont )
{
return Insert( XclFontData( rFont ), eColorType, bAppFont );
}
@@ -1093,7 +1093,7 @@ sal_uInt16 XclExpFontBuffer::Insert( const SfxItemSet& rItemSet,
sal_Int16 nScript, XclExpColorType eColorType, bool bAppFont )
{
// #i17050# script type now provided by caller
- Font aFont = XclExpFontHelper::GetFontFromItemSet( GetRoot(), rItemSet, nScript );
+ vcl::Font aFont = XclExpFontHelper::GetFontFromItemSet( GetRoot(), rItemSet, nScript );
return Insert( aFont, eColorType, bAppFont );
}
@@ -2922,7 +2922,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
// check if non default font is set and only export then
if (rSet.GetItemState(rSet.GetPool()->GetWhich( SID_ATTR_CHAR_FONT )) == SfxItemState::SET )
{
- Font aFont = XclExpFontHelper::GetFontFromItemSet( GetRoot(), rSet, com::sun::star::i18n::ScriptType::WEAK );
+ vcl::Font aFont = XclExpFontHelper::GetFontFromItemSet( GetRoot(), rSet, com::sun::star::i18n::ScriptType::WEAK );
pFont = new XclExpFont( GetRoot(), XclFontData( aFont ), EXC_COLOR_CELLTEXT );
}
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 841b2c1bbb32..69b2b3520605 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -445,7 +445,7 @@ void XclImpFont::GuessScriptType()
// find the script types for which the font contains characters
if( OutputDevice* pPrinter = GetPrinter() )
{
- Font aFont( maData.maName, Size( 0, 10 ) );
+ vcl::Font aFont( maData.maName, Size( 0, 10 ) );
FontCharMap aCharMap;
pPrinter->SetFont( aFont );
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 2bb35751b2ea..e43800b0dfcf 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -203,7 +203,7 @@ void XclRoot::SetCharWidth( const XclFontData& rFontData )
mrData.mnCharWidth = 0;
if( OutputDevice* pPrinter = GetPrinter() )
{
- Font aFont( rFontData.maName, Size( 0, rFontData.mnHeight ) );
+ vcl::Font aFont( rFontData.maName, Size( 0, rFontData.mnHeight ) );
aFont.SetFamily( rFontData.GetScFamily( GetTextEncoding() ) );
aFont.SetCharSet( rFontData.GetFontEncoding() );
aFont.SetWeight( rFontData.GetScWeight() );
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 69f27748853f..405c6016a9c6 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -171,7 +171,7 @@ XclFontData::XclFontData()
Clear();
}
-XclFontData::XclFontData( const Font& rFont )
+XclFontData::XclFontData( const vcl::Font& rFont )
{
Clear();
FillFromVclFont( rFont );
@@ -196,7 +196,7 @@ void XclFontData::Clear()
mbItalic = mbStrikeout = mbOutline = mbShadow = false;
}
-void XclFontData::FillFromVclFont( const Font& rFont )
+void XclFontData::FillFromVclFont( const vcl::Font& rFont )
{
maName = XclTools::GetXclFontName( rFont.GetName() ); // substitute with MS fonts
maStyle = "";
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 );
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index 0480c596f558..88a83c32bbd1 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -38,7 +38,7 @@ namespace {
const sal_uInt8 BIFF12_STRINGFLAG_FONTS = 0x01;
const sal_uInt8 BIFF12_STRINGFLAG_PHONETICS = 0x02;
-inline bool lclNeedsRichTextFormat( const Font* pFont )
+inline bool lclNeedsRichTextFormat( const oox::xls::Font* pFont )
{
return pFont && pFont->needsRichTextFormat();
}
@@ -76,7 +76,7 @@ void RichStringPortion::finalizeImport()
mxFont = getStyles().getFont( mnFontId );
}
-void RichStringPortion::convert( const Reference< XText >& rxText, const Font* pFont, bool bReplace )
+void RichStringPortion::convert( const Reference< XText >& rxText, const oox::xls::Font* pFont, bool bReplace )
{
if ( mbConverted )
return;
@@ -110,7 +110,7 @@ void RichStringPortion::convert( const Reference< XText >& rxText, const Font* p
mbConverted = true;
}
-void RichStringPortion::convert( ScEditEngineDefaulter& rEE, ESelection& rSelection, const Font* pFont )
+void RichStringPortion::convert( ScEditEngineDefaulter& rEE, ESelection& rSelection, const oox::xls::Font* pFont )
{
rSelection.nStartPos = rSelection.nEndPos;
rSelection.nStartPara = rSelection.nEndPara;
@@ -145,7 +145,7 @@ void RichStringPortion::convert( ScEditEngineDefaulter& rEE, ESelection& rSelect
rEE.QuickSetAttribs( aItemSet, rSelection );
}
-void RichStringPortion::writeFontProperties( const Reference<XText>& rxText, const Font* pFont ) const
+void RichStringPortion::writeFontProperties( const Reference<XText>& rxText, const oox::xls::Font* pFont ) const
{
PropertySet aPropSet(rxText);
@@ -358,7 +358,7 @@ void RichString::finalizeImport()
maTextPortions.forEachMem( &RichStringPortion::finalizeImport );
}
-bool RichString::extractPlainString( OUString& orString, const Font* pFirstPortionFont ) const
+bool RichString::extractPlainString( OUString& orString, const oox::xls::Font* pFirstPortionFont ) const
{
if( !maPhonPortions.empty() )
return false;
@@ -375,7 +375,7 @@ bool RichString::extractPlainString( OUString& orString, const Font* pFirstPorti
return false;
}
-void RichString::convert( const Reference< XText >& rxText, bool bReplaceOld, const Font* pFirstPortionFont ) const
+void RichString::convert( const Reference< XText >& rxText, bool bReplaceOld, const oox::xls::Font* pFirstPortionFont ) const
{
if (maTextPortions.size() == 1)
{
@@ -395,7 +395,7 @@ void RichString::convert( const Reference< XText >& rxText, bool bReplaceOld, co
}
}
-::EditTextObject* RichString::convert( ScEditEngineDefaulter& rEE, const Font* pFirstPortionFont ) const
+::EditTextObject* RichString::convert( ScEditEngineDefaulter& rEE, const oox::xls::Font* pFirstPortionFont ) const
{
ESelection aSelection;
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index a9fa35ded01e..6fc4922e065f 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -152,7 +152,7 @@ void SheetDataBuffer::setStringCell( const CellModel& rModel, const OUString& rT
void SheetDataBuffer::setStringCell( const CellModel& rModel, const RichStringRef& rxString )
{
OSL_ENSURE( rxString.get(), "SheetDataBuffer::setStringCell - missing rich string object" );
- const Font* pFirstPortionFont = getStyles().getFontFromCellXf( rModel.mnXfId ).get();
+ const oox::xls::Font* pFirstPortionFont = getStyles().getFontFromCellXf( rModel.mnXfId ).get();
OUString aText;
if( rxString->extractPlainString( aText, pFirstPortionFont ) )
{
diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx
index 359a76ac3b2a..a776cbb0eeb7 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -126,7 +126,7 @@ void UnitConverter::finalizeImport()
maCoeffs[ UNIT_REFDEVY ] = 100000.0 / aInfo.PixelPerMeterY;
// get character widths from default font
- if( const Font* pDefFont = getStyles().getDefaultFont().get() )
+ if( const oox::xls::Font* pDefFont = getStyles().getDefaultFont().get() )
{
// XDevice expects pixels in font descriptor, but font contains twips
FontDescriptor aDesc = pDefFont->getFontDescriptor();
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index ddc4ba556a69..7ba4bafe63f2 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1556,7 +1556,7 @@ void WorksheetHelper::putString( const CellAddress& rAddress, const OUString& rT
getDocImport().setStringCell(aAddress, rText);
}
-void WorksheetHelper::putRichString( const CellAddress& rAddress, const RichString& rString, const Font* pFirstPortionFont )
+void WorksheetHelper::putRichString( const CellAddress& rAddress, const RichString& rString, const oox::xls::Font* pFirstPortionFont )
{
ScEditEngineDefaulter& rEE = getEditEngine();
generated by cgit (git 2.34.1) at 2024-06-14 15:58:10 +0000