summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/control/ctrlbox.cxx10
-rw-r--r--svtools/source/control/ctrltool.cxx32
-rw-r--r--svtools/source/control/stdmenu.cxx2
3 files changed, 21 insertions, 23 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 8b44e85c314d..412715514b1e 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1062,7 +1062,7 @@ void FontNameBox::Fill( const FontList* pList )
sal_uInt16 nFontCount = pList->GetFontNameCount();
for ( sal_uInt16 i = 0; i < nFontCount; i++ )
{
- const FontInfo& rFontInfo = pList->GetFontName( i );
+ const vcl::FontInfo& rFontInfo = pList->GetFontName( i );
sal_uLong nIndex = InsertEntry( rFontInfo.GetName() );
if ( nIndex != LISTBOX_ERROR )
{
@@ -1138,13 +1138,11 @@ namespace
}
}
-
-
void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
{
assert( mpFontList );
- FontInfo& rInfo = (*mpFontList)[ rUDEvt.GetItemId() ];
+ vcl::FontInfo& rInfo = (*mpFontList)[ rUDEvt.GetItemId() ];
Point aTopLeft = rUDEvt.GetRect().TopLeft();
long nX = aTopLeft.X();
long nH = rUDEvt.GetRect().GetHeight();
@@ -1425,7 +1423,7 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
bool bBold = false;
bool bBoldItalic = false;
bool bInsert = false;
- FontInfo aInfo;
+ vcl::FontInfo aInfo;
while ( hFontInfo )
{
aInfo = pList->GetFontInfo( hFontInfo );
@@ -1649,7 +1647,7 @@ void FontSizeBox::Modify()
}
}
-void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList )
+void FontSizeBox::Fill( const vcl::FontInfo* pInfo, const FontList* pList )
{
// remember for relative mode
pFontList = pList;
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 431738ceb935..4308379d6012 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -67,7 +67,7 @@ static const sal_IntPtr aStdSizeAry[] =
0
};
-class ImplFontListFontInfo : public FontInfo
+class ImplFontListFontInfo : public vcl::FontInfo
{
friend class FontList;
@@ -76,9 +76,9 @@ private:
ImplFontListFontInfo* mpNext;
public:
- ImplFontListFontInfo( const FontInfo& rInfo,
+ ImplFontListFontInfo( const vcl::FontInfo& rInfo,
OutputDevice* pDev ) :
- FontInfo( rInfo ), mpNext(NULL)
+ vcl::FontInfo( rInfo ), mpNext(NULL)
{
mpDevice = pDev;
}
@@ -241,7 +241,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll,
sal_uInt16 i;
for( i = 0; i < n; i++ )
{
- FontInfo aFontInfo = pDevice->GetDevFont( i );
+ vcl::FontInfo aFontInfo = pDevice->GetDevFont( i );
// ignore raster-fonts if they are not to be displayed
if ( !bAll && (aFontInfo.GetType() == TYPE_RASTER) )
@@ -289,7 +289,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll,
(pNewInfo->GetCharSet() == eSystemEncoding) )
{
ImplFontListFontInfo* pTemp2 = pTemp->mpNext;
- *((FontInfo*)pTemp) = *((FontInfo*)pNewInfo);
+ *((vcl::FontInfo*)pTemp) = *((vcl::FontInfo*)pNewInfo);
pTemp->mpNext = pTemp2;
}
delete pNewInfo;
@@ -418,7 +418,7 @@ const OUString& FontList::GetStyleName(FontWeight eWeight, FontItalic eItalic) c
}
}
-OUString FontList::GetStyleName(const FontInfo& rInfo) const
+OUString FontList::GetStyleName(const vcl::FontInfo& rInfo) const
{
OUString aStyleName = rInfo.GetStyleName();
FontWeight eWeight = rInfo.GetWeight();
@@ -469,7 +469,7 @@ OUString FontList::GetStyleName(const FontInfo& rInfo) const
return aStyleName;
}
-OUString FontList::GetFontMapText( const FontInfo& rInfo ) const
+OUString FontList::GetFontMapText( const vcl::FontInfo& rInfo ) const
{
if ( rInfo.GetName().isEmpty() )
{
@@ -539,10 +539,10 @@ OUString FontList::GetFontMapText( const FontInfo& rInfo ) const
namespace
{
- FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const OUString &rName,
+ vcl::FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const OUString &rName,
FontWeight eWeight, FontItalic eItalic)
{
- FontInfo aInfo;
+ vcl::FontInfo aInfo;
// if the fontname matches, we copy as much as possible
if (pFontNameInfo)
{
@@ -562,7 +562,7 @@ namespace
}
}
-FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
+vcl::FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
{
ImplFontListNameInfo* pData = ImplFindByName( rName );
ImplFontListFontInfo* pFontInfo = NULL;
@@ -585,7 +585,7 @@ FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
}
// reproduce attributes if data could not be found
- FontInfo aInfo;
+ vcl::FontInfo aInfo;
if ( !pFontInfo )
{
FontWeight eWeight = WEIGHT_DONTKNOW;
@@ -643,7 +643,7 @@ FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
return aInfo;
}
-FontInfo FontList::Get(const OUString& rName,
+vcl::FontInfo FontList::Get(const OUString& rName,
FontWeight eWeight, FontItalic eItalic) const
{
ImplFontListNameInfo* pData = ImplFindByName( rName );
@@ -667,7 +667,7 @@ FontInfo FontList::Get(const OUString& rName,
}
// reproduce attributes if data could not be found
- FontInfo aInfo;
+ vcl::FontInfo aInfo;
if ( !pFontInfo )
aInfo = makeMissing(pFontNameInfo, rName, eWeight, eItalic);
else
@@ -684,7 +684,7 @@ bool FontList::IsAvailable(const OUString& rName) const
return (ImplFindByName( rName ) != 0);
}
-const FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const
+const vcl::FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const
{
DBG_ASSERT( nFont < GetFontNameCount(), "FontList::GetFontName(): nFont >= Count" );
@@ -706,13 +706,13 @@ sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo ) const
return (sal_Handle)(pInfo->mpNext);
}
-const FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const
+const vcl::FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const
{
ImplFontListFontInfo* pInfo = (ImplFontListFontInfo*)(void*)hFontInfo;
return *pInfo;
}
-const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const
+const sal_IntPtr* FontList::GetSizeAry( const vcl::FontInfo& rInfo ) const
{
// first delete Size-Array
if ( mpSizeAry )
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index d3104099af55..860550ae9179 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -140,7 +140,7 @@ void FontSizeMenu::Highlight()
mnCurHeight = nTempHeight;
}
-void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList )
+void FontSizeMenu::Fill( const vcl::FontInfo& rInfo, const FontList* pList )
{
Clear();
generated by cgit (git 2.34.1) at 2024-12-27 19:13:17 +0000