From 60e78fbb806bb45e635ba1de45ceffe187938ac0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Sep 2014 10:09:58 +0200 Subject: fdo#82577: Handle Font Put the VCL Font class in the vcl namespace. Avoids clash with the X11 Font typedef. Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537 --- accessibility/inc/accessibility/helper/characterattributeshelper.hxx | 2 +- accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 2 +- accessibility/source/extended/AccessibleGridControlBase.cxx | 2 +- accessibility/source/extended/accessibletabbar.cxx | 4 ++-- accessibility/source/extended/textwindowaccessibility.cxx | 2 +- accessibility/source/helper/characterattributeshelper.cxx | 2 +- accessibility/source/standard/vclxaccessiblemenuitem.cxx | 2 +- accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 2 +- accessibility/source/standard/vclxaccessibletabpage.cxx | 2 +- accessibility/source/standard/vclxaccessibletextcomponent.cxx | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) (limited to 'accessibility') diff --git a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx index b567749f5cdc..22d0604f1355 100644 --- a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx +++ b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx @@ -40,7 +40,7 @@ private: public: - CharacterAttributesHelper( const Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor ); + CharacterAttributesHelper( const vcl::Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor ); ~CharacterAttributesHelper(); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetCharacterAttributes(); diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index bf2e75fca1eb..bc0ad897f1a1 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -509,7 +509,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (::com::sun: nColor = pInst->GetControlForeground().GetColor(); else { - Font aFont; + vcl::Font aFont; if ( pInst->IsControlFont() ) aFont = pInst->GetControlFont(); else diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index b79e753c7d3a..cb9a6bf3b7a8 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -426,7 +426,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (::com::su nColor = pInst->GetControlForeground().GetColor(); else { - Font aFont; + vcl::Font aFont; if ( pInst->IsControlFont() ) aFont = pInst->GetControlFont(); else diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index d43f3f2ba8ac..1fc53c747045 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -444,7 +444,7 @@ namespace accessibility nColor = m_pTabBar->GetControlForeground().GetColor(); else { - Font aFont; + vcl::Font aFont; if ( m_pTabBar->IsControlFont() ) aFont = m_pTabBar->GetControlFont(); else @@ -488,7 +488,7 @@ namespace accessibility Reference< awt::XDevice > xDev( m_pTabBar->GetComponentInterface(), UNO_QUERY ); if ( xDev.is() ) { - Font aFont; + vcl::Font aFont; if ( m_pTabBar->IsControlFont() ) aFont = m_pTabBar->GetControlFont(); else diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 4a829707b77f..24f0be2652e8 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -997,7 +997,7 @@ Document::retrieveCharacterAttributes( { ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock()); - Font aFont = m_rEngine.GetFont(); + vcl::Font aFont = m_rEngine.GetFont(); const sal_Int32 AttributeCount = 9; sal_Int32 i = 0; css::uno::Sequence< css::beans::PropertyValue > aAttribs( AttributeCount ); diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx index 9f40168c1b78..df7e241f187b 100644 --- a/accessibility/source/helper/characterattributeshelper.cxx +++ b/accessibility/source/helper/characterattributeshelper.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -CharacterAttributesHelper::CharacterAttributesHelper( const Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor ) +CharacterAttributesHelper::CharacterAttributesHelper( const vcl::Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor ) { m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharBackColor" ), makeAny( (sal_Int32) nBackColor ) ) ); m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharColor" ), makeAny( (sal_Int32) nColor ) ) ); diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 4c7c7dcc7587..971f3194bbf8 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -242,7 +242,7 @@ Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_In if ( !implIsValidIndex( nIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); - Font aFont = Application::GetSettings().GetStyleSettings().GetMenuFont(); + vcl::Font aFont = Application::GetSettings().GetStyleSettings().GetMenuFont(); sal_Int32 nBackColor = getBackground(); sal_Int32 nColor = getForeground(); return CharacterAttributesHelper( aFont, nBackColor, nColor ) diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 18786b9fccdb..6ed6ec6e4a58 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -511,7 +511,7 @@ Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( s if ( m_pStatusBar ) { - Font aFont = m_pStatusBar->GetFont(); + vcl::Font aFont = m_pStatusBar->GetFont(); sal_Int32 nBackColor = getBackground(); sal_Int32 nColor = getForeground(); aValues = CharacterAttributesHelper( aFont, nBackColor, nColor ) diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 6a9c23b2ae60..5797ccca10d6 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -585,7 +585,7 @@ Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int if ( m_pTabControl ) { - Font aFont = m_pTabControl->GetFont(); + vcl::Font aFont = m_pTabControl->GetFont(); sal_Int32 nBackColor = getBackground(); sal_Int32 nColor = getForeground(); aValues = CharacterAttributesHelper( aFont, nBackColor, nColor ) diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index 7e3104fa805e..ba92960e4d02 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -183,7 +183,7 @@ Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( s if ( GetWindow() ) { - Font aFont = GetWindow()->GetControlFont(); + vcl::Font aFont = GetWindow()->GetControlFont(); sal_Int32 nBackColor = GetWindow()->GetControlBackground().GetColor(); sal_Int32 nColor = GetWindow()->GetControlForeground().GetColor(); -- cgit