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

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

Conflicts:
	include/svtools/ctrltool.hxx
	include/vcl/metric.hxx
	include/vcl/outdev.hxx
	svtools/source/control/ctrlbox.cxx
	svtools/source/control/ctrltool.cxx
	svtools/source/control/stdmenu.cxx
	svx/source/sidebar/nbdtmg.cxx
	sw/source/core/uibase/docvw/srcedtw.cxx
	vcl/source/gdi/metric.cxx
	vcl/source/outdev/font.cxx

Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8
Reviewed-on: https://gerrit.libreoffice.org/9720
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 28 insertions, 28 deletions

diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index a5384b3d8377..a77c7aceb1cf 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 5ae6b73682bb..85f5ebbab953 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1805,30 +1805,30 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn
             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( sal_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/sidebar/text/SvxSBFontNameBox.cxx b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
index b94c6131e361..66ba899f3423 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
@@ -156,7 +156,7 @@ void SvxSBFontNameBox::Select()
     if ( !IsTravelSelect() )
     {
         FillList();
-        FontInfo aInfo( pFontList->Get( GetText(),WEIGHT_NORMAL, ITALIC_NORMAL ) );//meWeight, meItalic
+        vcl::FontInfo aInfo( pFontList->Get( GetText(),WEIGHT_NORMAL, ITALIC_NORMAL ) );//meWeight, meItalic
 
         SvxFontItem aFontItem( aInfo.GetFamily(), aInfo.GetName(), aInfo.GetStyleName(),
             aInfo.GetPitch(), aInfo.GetCharSet(), SID_ATTR_CHAR_FONT );
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 0b8283edd7e8..6a1803679c83 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -295,7 +295,7 @@ void TextPropertyPanel::Initialize (void)
     }
 
     mpFontNameBox->SetAccessibleName(mpFontNameBox->GetQuickHelpText());
-    const FontInfo aFontInfo (mpFontList->Get( OUString( "" ), OUString( "" )));
+    const vcl::FontInfo aFontInfo (mpFontList->Get( OUString( "" ), OUString( "" )));
     mpFontSizeBox->Fill(&aFontInfo,mpFontList);
     mpFontSizeBox->SetAccessibleName(mpFontSizeBox->GetQuickHelpText());
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5621dc1f0a86..d5cdd4f93c88 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -993,7 +993,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() ) );
 
@@ -1019,7 +1019,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 ad99d66ffa67..8295a8a0c0f5 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -167,7 +167,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 );