diff options
Diffstat (limited to 'sd')
33 files changed, 63 insertions, 63 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index ee84cb4349d8..7fbe423a7ca3 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -155,7 +155,7 @@ public: /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); + const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); /** This is called internally when text conversion is started. The position of current view mode/page/object/caret position diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 2e0a174f69e7..1998e4d039be 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -571,7 +571,7 @@ public: /** return the document fonts for latin, cjk and ctl according to the current languages set at this document */ - SAL_DLLPRIVATE void getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rCTLFont ); + SAL_DLLPRIVATE void getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ); SAL_DLLPRIVATE sd::UndoManager* GetUndoManager() const; diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index ae146096542d..15958987fe55 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -86,8 +86,8 @@ public: void CreatePseudosIfNecessary(); void UpdateStdNames(); - static void PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont ); - static Font GetBulletFont(); + static void PutNumBulletItem( SfxStyleSheetBase* pSheet, vcl::Font& rBulletFont ); + static vcl::Font GetBulletFont(); SdDrawDocument* GetDoc() const { return mpDoc; } diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index b5ab78dd473a..5daa653a5d58 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -180,7 +180,7 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(makeSdrShadowXDistItem(200)); // 3 mm Shadow distance rISet.Put(makeSdrShadowYDistItem(200)); - Font aLatinFont, aCJKFont, aCTLFont; + vcl::Font aLatinFont, aCJKFont, aCTLFont; getDefaultFonts( aLatinFont, aCJKFont, aCTLFont ); @@ -241,7 +241,7 @@ void SdDrawDocument::CreateLayoutTemplates() aBulletItem.SetStart(1); aBulletItem.SetScale(45); // In percent - Font aBulletFont( SdStyleSheetPool::GetBulletFont() ); + vcl::Font aBulletFont( SdStyleSheetPool::GetBulletFont() ); aBulletFont.SetSize(Size(0,635)); // sj: (i33745) changed default from 24 to 18 pt @@ -560,7 +560,7 @@ void SdDrawDocument::CreateDefaultCellStyles() rISet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); rISet.Put(XFillColorItem(OUString(), RGB_Color(0x00ccccff))); - Font aLatinFont, aCJKFont, aCTLFont; + vcl::Font aLatinFont, aCJKFont, aCTLFont; getDefaultFonts( aLatinFont, aCJKFont, aCTLFont ); @@ -1204,7 +1204,7 @@ void SdDrawDocument::SetTextDefaults() const { // BulletItem and BulletFont for Titel and Outline SvxBulletItem aBulletItem(EE_PARA_BULLET); - Font aBulletFont( SdStyleSheetPool::GetBulletFont() ); + vcl::Font aBulletFont( SdStyleSheetPool::GetBulletFont() ); aBulletFont.SetSize(Size(0,846)); // 24 pt aBulletItem.SetFont(aBulletFont); aBulletItem.SetStyle(BS_BULLET); @@ -1292,7 +1292,7 @@ void SdDrawDocument::SetDefaultWritingMode(::com::sun::star::text::WritingMode e } } -void SdDrawDocument::getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rCTLFont ) +void SdDrawDocument::getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ) { LanguageType eLatin = GetLanguage( EE_CHAR_LANGUAGE ); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 4a6a94059143..512df9c78e3e 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -190,7 +190,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool OUString aPrefix(rLayoutName + SD_LT_SEPARATOR); - Font aLatinFont, aCJKFont, aCTLFont; + vcl::Font aLatinFont, aCJKFont, aCTLFont; mpDoc->getDefaultFonts( aLatinFont, aCJKFont, aCTLFont ); @@ -204,7 +204,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(), aCTLFont.GetCharSet(), EE_CHAR_FONTINFO_CTL ); - Font aBulletFont( GetBulletFont() ); + vcl::Font aBulletFont( GetBulletFont() ); /************************************************************************** * outline levels @@ -261,7 +261,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool if( nLevel == 1 ) { - Font f( GetBulletFont() ); + vcl::Font f( GetBulletFont() ); PutNumBulletItem( pSheet, f ); } } @@ -423,7 +423,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool aSvxLRSpaceItem.SetTxtLeft(0); rSubtitleSet.Put(aSvxLRSpaceItem); - Font aTmpFont( GetBulletFont() ); + vcl::Font aTmpFont( GetBulletFont() ); aTmpFont.SetSize(Size(0, 1129)); // 32 pt PutNumBulletItem( pSheet, aTmpFont ); } @@ -1090,7 +1090,7 @@ void SdStyleSheetPool::setDefaultOutlineNumberFormatBulletAndIndent(sal_uInt16 i // Set new SvxNumBulletItem for the respective style sheet void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, - Font& rBulletFont ) + vcl::Font& rBulletFont ) { OUString aHelpFile; sal_uLong nHelpId = pSheet->GetHelpId( aHelpFile ); @@ -1217,9 +1217,9 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, |* \************************************************************************/ -Font SdStyleSheetPool::GetBulletFont() +vcl::Font SdStyleSheetPool::GetBulletFont() { - Font aBulletFont( OUString( "StarSymbol" ), Size(0, 1000) ); + vcl::Font aBulletFont( OUString( "StarSymbol" ), Size(0, 1000) ); aBulletFont.SetCharSet(RTL_TEXTENCODING_UNICODE); aBulletFont.SetWeight(WEIGHT_NORMAL); aBulletFont.SetUnderline(UNDERLINE_NONE); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 73bb35c8d25f..f960506fd141 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -1017,7 +1017,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con { if( EE_PARA_NUMBULLET == pEntry->nWID ) { - Font aBulletFont; + vcl::Font aBulletFont; SdStyleSheetPool::PutNumBulletItem( this, aBulletFont ); aSet.Put( rStyleSet ); } diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 22a62b48c9fe..358157662ff5 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -1426,7 +1426,7 @@ sal_uInt32 FontCollection::GetId( FontCollectionEntry& rEntry ) if( pEntry->Name == rEntry.Name ) return i; } - Font aFont; + vcl::Font aFont; aFont.SetCharSet( rEntry.CharSet ); aFont.SetName( rEntry.Original ); aFont.SetHeight( 100 ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index c3bc421df3b7..caec627bcaec 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -915,7 +915,7 @@ void FontStylePropertyBox::update() mpMenu->CheckItem( CM_UNDERLINED, mnFontUnderline != awt::FontUnderline::NONE ); // update sample edit - Font aFont( mpEdit->GetFont() ); + vcl::Font aFont( mpEdit->GetFont() ); aFont.SetWeight( mfFontWeight == awt::FontWeight::BOLD ? WEIGHT_BOLD : WEIGHT_NORMAL ); aFont.SetItalic( meFontSlant == awt::FontSlant_ITALIC ? ITALIC_NORMAL : ITALIC_NONE ); aFont.SetUnderline( mnFontUnderline == awt::FontUnderline::NONE ? UNDERLINE_NONE : UNDERLINE_SINGLE ); diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 1c10fddcf32c..33c8cb1f0ae0 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -109,7 +109,7 @@ SfxItemPool* GetAnnotationPool() mpAnnotationPool = EditEngine::CreatePool( false ); mpAnnotationPool->SetPoolDefaultItem(SvxFontHeightItem(423,100,EE_CHAR_FONTHEIGHT)); - Font aAppFont( Application::GetSettings().GetStyleSettings().GetAppFont() ); + vcl::Font aAppFont( Application::GetSettings().GetStyleSettings().GetAppFont() ); mpAnnotationPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamily(),aAppFont.GetName(),"",PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW,EE_CHAR_FONTINFO)); } diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 36b40e40870c..f81c76112fcd 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -124,7 +124,7 @@ private: bool mbShowAnnotations; ImplSVEvent * mnUpdateTagsEvent; - Font maFont; + vcl::Font maFont; }; OUString getAnnotationDateTimeString( const css::uno::Reference< css::office::XAnnotation >& xAnnotation ); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index f62c89a0ece8..8c22c8a62a9c 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -267,7 +267,7 @@ Pointer AnnotationHdl::GetSdrDragPointer() const return Pointer( eStyle ); } -AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const Reference< XAnnotation >& xAnnotation, Color& rColor, int nIndex, const Font& rFont ) +AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const Reference< XAnnotation >& xAnnotation, Color& rColor, int nIndex, const vcl::Font& rFont ) : SmartTag( rView ) , mrManager( rManager ) , mxAnnotation( xAnnotation ) diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index 869ae81fb527..515d7b155a07 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -34,7 +34,7 @@ class AnnotationWindow; class AnnotationTag : public SmartTag { public: - AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const css::uno::Reference< css::office::XAnnotation >& xAnnotation, Color& rColor, int nIndex, const Font& rFont ); + AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const css::uno::Reference< css::office::XAnnotation >& xAnnotation, Color& rColor, int nIndex, const vcl::Font& rFont ); virtual ~AnnotationTag(); /// @return true if the SmartTag handled the event. @@ -82,7 +82,7 @@ private: std::auto_ptr<AnnotationWindow> mpAnnotationWindow; Color maColor; int mnIndex; - const Font& mrFont; + const vcl::Font& mrFont; Size maSize; ImplSVEvent * mnClosePopupEvent; ::Window* mpListenWindow; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index c9f0e31b2663..336682484d44 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -308,7 +308,7 @@ void AnnotationWindow::InitControls() // with variable meta size height AllSettings aSettings = mpMeta->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - Font aFont = aStyleSettings.GetFieldFont(); + vcl::Font aFont = aStyleSettings.GetFieldFont(); aFont.SetHeight(8); aStyleSettings.SetFieldFont(aFont); aSettings.SetStyleSettings(aStyleSettings); @@ -374,7 +374,7 @@ void AnnotationWindow::Rescale() mpTextWindow->SetMapMode( aMode ); if ( mpMeta ) { - Font aFont( mpMeta->GetSettings().GetStyleSettings().GetFieldFont() ); + vcl::Font aFont( mpMeta->GetSettings().GetStyleSettings().GetFieldFont() ); sal_Int32 nHeight = aFont.GetHeight(); nHeight = nHeight * aMode.GetScaleY().GetNumerator() / aMode.GetScaleY().GetDenominator(); aFont.SetHeight( nHeight ); diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 4cbe097eca8b..0377b7c5e659 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -301,8 +301,8 @@ void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry ) Point aPos( rRect.TopLeft() ); // Setup fonts - Font aStdFont( GetFont() ); - Font aBoldFont( aStdFont ); + vcl::Font aStdFont( GetFont() ); + vcl::Font aBoldFont( aStdFont ); aBoldFont.SetWeight( WEIGHT_BOLD ); SetFont( aBoldFont ); long aTextHeight = GetTextHeight(); diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 4563e1e98b7d..d0b505c615ec 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -62,7 +62,7 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& long nWeightID = SID_ATTR_CHAR_WEIGHT; long nPostureID = SID_ATTR_CHAR_POSTURE; - Font aMyFont; + vcl::Font aMyFont; const SvxFontItem& rFItem = (SvxFontItem&)rSet.Get(GetWhich( (sal_uInt16)nFontID )); aMyFont.SetFamily(rFItem.GetFamily()); diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 7fdee9ce7011..30d239c4e374 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -156,7 +156,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_CHARMAP), false, &pItem); OUString aChars; - Font aFont; + vcl::Font aFont; if ( pItem ) { aChars = ((const SfxStringItem*)pItem)->GetValue(); @@ -166,7 +166,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) if ( pFontItem ) { OUString aFontName = pFontItem->GetValue(); - aFont = Font( aFontName, Size(1,1) ); + aFont = vcl::Font( aFontName, Size(1,1) ); } else { @@ -174,7 +174,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) mpView->GetAttributes( aFontAttr ); const SvxFontItem* pFItem = (const SvxFontItem*)aFontAttr.GetItem( SID_ATTR_CHAR_FONT ); if( pFItem ) - aFont = Font( pFItem->GetFamilyName(), pFItem->GetStyleName(), Size( 1, 1 ) ); + aFont = vcl::Font( pFItem->GetFamilyName(), pFItem->GetStyleName(), Size( 1, 1 ) ); } } diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 24a3f0b1212f..c5049a502c01 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -97,7 +97,7 @@ rtl::Reference<FuPoor> FuHangulHanjaConversion::Create( ViewShell* pViewSh, ::sd * Search and replace */ void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ) + const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ) { mpView->BegUndo(SD_RESSTR(STR_UNDO_HANGULHANJACONVERSION)); @@ -148,7 +148,7 @@ void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_In mpView->EndUndo(); } -void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const Font *pTargetFont ) +void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const vcl::Font *pTargetFont ) { if( !mpDoc ) return; @@ -241,7 +241,7 @@ void FuHangulHanjaConversion::StartChineseConversion() if( !bCommonTerms ) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - Font aTargetFont = OutputDevice::GetDefaultFont( + vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_PRESENTATION, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 48f7f788c6fa..837d1b788e4f 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -211,8 +211,8 @@ private: /** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */ std::auto_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard; - Font maPageNumberFont; - Font maBulletFont; + vcl::Font maPageNumberFont; + vcl::Font maBulletFont; SvxLRSpaceItem maLRSpaceItem; Image maSlideImage; diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 93a1a21cf945..25669f68bdad 100644 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -34,11 +34,11 @@ class FuHangulHanjaConversion : public FuPoor static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); + const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); void StartChineseConversion(); - void ConvertStyles( sal_Int16 nTargetLanguage, const Font *pTargetFont ); + void ConvertStyles( sal_Int16 nTargetLanguage, const vcl::Font *pTargetFont ); Outliner* GetOutliner() const { return pSdOutliner; } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 9c3166c4f270..5b2fe7a52146 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -327,7 +327,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) const FontDta &rFntDta = aTable[i]; LanguageType nLang = (LANGUAGE_NONE == rFntDta.nLang) ? rFntDta.nFallbackLang : rFntDta.nLang; - Font aFont = OutputDevice::GetDefaultFont( + vcl::Font aFont = OutputDevice::GetDefaultFont( rFntDta.nFontType, nLang, DEFAULTFONT_FLAGS_ONLYONE); mpEditEngineItemPool->SetPoolDefaultItem( SvxFontItem( diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index f24e6a153e85..29038e6cf8db 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -469,8 +469,8 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) OUString aText( SdResId( STR_PRES_PAUSE ) ); bool bDrawn = false; - Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); - const Font aOldFont( GetFont() ); + vcl::Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); + const vcl::Font aOldFont( GetFont() ); aFont.SetSize( aTextSize ); aFont.SetColor( COL_WHITE ); @@ -534,8 +534,8 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) void ShowWindow::DrawEndScene() { - const Font aOldFont( GetFont() ); - Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); + const vcl::Font aOldFont( GetFont() ); + vcl::Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); const Point aOutOrg( PixelToLogic( Point() ) ); const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, GetMapMode() ) ); diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index d80dad32dcf4..479602b72d43 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -25,7 +25,7 @@ #include <boost/shared_ptr.hpp> #include <vcl/mapmod.hxx> -class Font; +namespace vcl { class Font; } namespace sd { namespace slidesorter { namespace view { @@ -36,7 +36,7 @@ class FontProvider : public SdGlobalResource { public: - typedef ::boost::shared_ptr<Font> SharedFontPointer; + typedef ::boost::shared_ptr<vcl::Font> SharedFontPointer; /** Return the single instance of this class. Throws a RuntimeException when no instance can be created. diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index d4070714e45a..25d9192716d2 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -133,7 +133,7 @@ private: Rectangle maCustomAnimationEffectBoundingBox; const Image maTransitionEffectIcon; const Image maCustomAnimationEffectIcon; - const ::boost::shared_ptr<Font> mpPageNumberFont; + const ::boost::shared_ptr<vcl::Font> mpPageNumberFont; Size GetPageNumberAreaSize (const int nPageCount); Rectangle CalculatePreviewBoundingBox ( diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index dcc9065c4b85..6cbaa06b29a9 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -73,7 +73,7 @@ private: ::boost::shared_ptr<cache::PageCache> mpCache; ::boost::shared_ptr<controller::Properties> mpProperties; ::boost::shared_ptr<view::Theme> mpTheme; - ::boost::shared_ptr<Font> mpPageNumberFont; + ::boost::shared_ptr<vcl::Font> mpPageNumberFont; ::boost::scoped_ptr<FramePainter> mpShadowPainter; ::boost::scoped_ptr<FramePainter> mpFocusBorderPainter; Bitmap maNormalBackground; diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index c0decd7a34c7..814bf1a3561c 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -58,7 +58,7 @@ public: Font_PageNumber, Font_PageCount }; - static ::boost::shared_ptr<Font> GetFont ( + static ::boost::shared_ptr<vcl::Font> GetFont ( const FontType eType, const OutputDevice& rDevice); diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 2863232ba22e..078b7b0c543d 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -244,7 +244,7 @@ void InsertionIndicatorOverlay::PaintPageCount ( { // Paint the number of slides. ::boost::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme()); - ::boost::shared_ptr<Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice)); + ::boost::shared_ptr<vcl::Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice)); if (pFont) { OUString sNumber (OUString::number(nSelectionCount)); diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index b056787b3a53..7d82198d722e 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -236,7 +236,7 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount) OSL_ASSERT(mpWindow); // Set the correct font. - Font aOriginalFont (mpWindow->GetFont()); + vcl::Font aOriginalFont (mpWindow->GetFont()); if (mpPageNumberFont) mpWindow->SetFont(*mpPageNumberFont); diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index a0ce837beaf0..d7fddd2b7d5a 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -128,22 +128,22 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert } } -::boost::shared_ptr<Font> Theme::GetFont ( +::boost::shared_ptr<vcl::Font> Theme::GetFont ( const FontType eType, const OutputDevice& rDevice) { - ::boost::shared_ptr<Font> pFont; + ::boost::shared_ptr<vcl::Font> pFont; switch (eType) { case Font_PageNumber: - pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); + pFont.reset(new vcl::Font(Application::GetSettings().GetStyleSettings().GetAppFont())); pFont->SetTransparent(true); pFont->SetWeight(WEIGHT_BOLD); break; case Font_PageCount: - pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); + pFont.reset(new vcl::Font(Application::GetSettings().GetStyleSettings().GetAppFont())); pFont->SetTransparent(true); pFont->SetWeight(WEIGHT_NORMAL); { diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index ee06476b6ffc..855e762029cf 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -330,8 +330,8 @@ void PreviewRenderer::PaintSubstitutionText (const OUString& rSubstitutionText) if (!rSubstitutionText.isEmpty()) { // Set the font size. - const Font& rOriginalFont (mpPreviewDevice->GetFont()); - Font aFont (mpPreviewDevice->GetSettings().GetStyleSettings().GetAppFont()); + const vcl::Font& rOriginalFont (mpPreviewDevice->GetFont()); + vcl::Font aFont (mpPreviewDevice->GetSettings().GetStyleSettings().GetAppFont()); sal_Int32 nHeight (mpPreviewDevice->PixelToLogic(Size(0,snSubstitutionTextSize)).Height()); aFont.SetHeight(nHeight); mpPreviewDevice->SetFont (aFont); diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index a5ffa6ae69a8..5880a6936d24 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -315,8 +315,8 @@ namespace { const OUString& rsPageString, const Point& rPageStringOffset) { - const Font aOriginalFont (rPrinter.OutputDevice::GetFont()); - rPrinter.SetFont(Font(FAMILY_SWISS, Size(0, 423))); + const vcl::Font aOriginalFont (rPrinter.OutputDevice::GetFont()); + rPrinter.SetFont(vcl::Font(FAMILY_SWISS, Size(0, 423))); rPrinter.DrawText(rPageStringOffset, rsPageString); rPrinter.SetFont(aOriginalFont); } diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index ea831ac39185..8b9676634119 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1453,7 +1453,7 @@ void Outliner::HandleChangedSelection (void) } void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ) + const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ) { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); bool bMultiDoc = pViewShell->ISA(DrawViewShell); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 3751311a5f25..d9855be75126 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1732,7 +1732,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) LanguageType eLang = rEditEngine.GetDefaultLanguage(); Point aTextPos( aImagePos.X() - aOffset.Width(), pInfo->mrStartPos.Y() ); - Font aNewFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, eLang, 0 ) ); + vcl::Font aNewFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, eLang, 0 ) ); aNewFont.SetSize( aFontSz ); aNewFont.SetVertical( bVertical ); aNewFont.SetOrientation( bVertical ? 2700 : 0 ); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index ff1267726d03..effd7c2f582b 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -374,7 +374,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // create font SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObject ); const SdrTextVertAdjust eTVA(pTextObj ? pTextObj->GetTextVerticalAdjust() : SDRTEXTVERTADJUST_CENTER); - Font aScaledVclFont; + vcl::Font aScaledVclFont; // use a text size factor to get more reliable text sizes from the text layouter // (and from vcl), tipp from HDU @@ -403,7 +403,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // get font attributes; use normally scaled font const basegfx::BColor aFontColor(aRGBColor); - Font aVclFont; + vcl::Font aVclFont; basegfx::B2DVector aTextSizeAttribute; aVclFont.SetHeight( 500 ); |