avoid problems with poppler's and vcl's FontInfo during runtime

Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8

Conflicts:
	include/vcl/metric.hxx
	svtools/source/control/ctrlbox.cxx
	svtools/source/control/ctrltool.cxx
	svtools/source/control/stdmenu.cxx
	svx/source/sidebar/nbdtmg.cxx

4 files changed, 26 insertions, 26 deletions

diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index a5a9c09c3223..2ec67f07fd0a 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -123,7 +123,7 @@ void SvxFontSizeMenuControl::StateChanged(
 
                     if ( pList )
                     {
-                        FontInfo aFntInf = pList->Get( pItem->GetFamilyName(),
+                        vcl::FontInfo aFntInf = pList->Get( pItem->GetFamilyName(),
                                                        pItem->GetStyleName() );
                         pMenu->Fill( aFntInf, pList );
                     }
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index d052708db75a..c2fbe6c0ef26 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1771,30 +1771,30 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
             if( pLevelSettings->sBulletFont.getLength() &&
                 pLevelSettings->sBulletFont.compareTo(rActBulletFont.GetName()))
             {
-                        //search for the font
-                        if(!pList)
-                        {
-                                SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
-                                const SvxFontListItem* pFontListItem = (const SvxFontListItem* )pCurDocShell->GetItem( SID_ATTR_CHAR_FONTLIST );
-                                pList = pFontListItem ? pFontListItem->GetFontList() : 0;
-                        }
-                        if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
-                        {
-                    FontInfo aInfo = pList->Get(pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
+                //search for the font
+                if(!pList)
+                {
+                    SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
+                    const SvxFontListItem* pFontListItem = (const SvxFontListItem* )pCurDocShell->GetItem( SID_ATTR_CHAR_FONTLIST );
+                    pList = pFontListItem ? pFontListItem->GetFontList() : 0;
+                }
+                if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
+                {
+                    vcl::FontInfo aInfo = pList->Get(pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
                     Font aFont(aInfo);
                     aFmt.SetBulletFont(&aFont);
-                        }
-                        else
-                        {
-                         //if it cannot be found then create a new one
-                         Font aCreateFont( pLevelSettings->sBulletFont, OUString(), Size( 0, 14 ) );
-                         aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
-                         aCreateFont.SetFamily( FAMILY_DONTKNOW );
-                         aCreateFont.SetPitch( PITCH_DONTKNOW );
-                         aCreateFont.SetWeight( WEIGHT_DONTKNOW );
-                         aCreateFont.SetTransparent( true );
-                         aFmt.SetBulletFont( &aCreateFont );
-                        }
+                }
+                else
+                {
+                    //if it cannot be found then create a new one
+                    Font aCreateFont( pLevelSettings->sBulletFont, OUString(), Size( 0, 14 ) );
+                    aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
+                    aCreateFont.SetFamily( FAMILY_DONTKNOW );
+                    aCreateFont.SetPitch( PITCH_DONTKNOW );
+                    aCreateFont.SetWeight( WEIGHT_DONTKNOW );
+                    aCreateFont.SetTransparent( true );
+                    aFmt.SetBulletFont( &aCreateFont );
+                }
             }else
                 aFmt.SetBulletFont( &rActBulletFont );
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d1771f2f5dc5..bf18eca941f3 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -994,7 +994,7 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
     if (  rUDEvt.GetItemId() == rUDEvt.GetStyle() )
     {
         Sequence< PropertyValue > aArgs( 1 );
-        FontInfo aInfo( pFontList->Get( GetEntry( rUDEvt.GetItemId() ),
+        vcl::FontInfo aInfo( pFontList->Get( GetEntry( rUDEvt.GetItemId() ),
             aCurFont.GetWeight(),
             aCurFont.GetItalic() ) );
 
@@ -1020,7 +1020,7 @@ void SvxFontNameBox_Impl::Select()
     std::auto_ptr<SvxFontItem> pFontItem;
     if ( pFontList )
     {
-        FontInfo aInfo( pFontList->Get( GetText(),
+        vcl::FontInfo aInfo( pFontList->Get( GetText(),
             aCurFont.GetWeight(),
             aCurFont.GetItalic() ) );
         aCurFont = aInfo;
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 3b3a9b0eeb52..02f7da9695ab 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -207,7 +207,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescripto
 
     if ( !rCurrentFont.Name.isEmpty() )
     {
-        FontInfo _aFontInfo;
+        vcl::FontInfo _aFontInfo;
         _aFontInfo.SetName( rCurrentFont.Name );
         _aFontInfo.SetStyleName( rCurrentFont.StyleName );
         _aFontInfo.SetHeight( rCurrentFont.Height );