summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/accessibility/AccessibleGraphicShape.cxx11
-rw-r--r--svx/source/accessibility/AccessibleOLEShape.cxx6
-rw-r--r--svx/source/accessibility/DescriptionGenerator.cxx16
-rw-r--r--svx/source/dialog/fntctrl.cxx113
-rw-r--r--svx/source/dialog/langbox.cxx11
5 files changed, 0 insertions, 157 deletions
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 7aec64ee0154..2b8034ca55a2 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -150,17 +150,6 @@ OUString
return sName;
}
-OUString AccessibleGraphicShape::CreateAccessibleDescription()
-{
- //Don't use the same information for accessible name and accessible description.
- OUString sDesc;
- if (m_pShape)
- sDesc = m_pShape->GetTitle();
- if (!sDesc.isEmpty())
- return sDesc;
- return CreateAccessibleBaseName();
-}
-
// Return this object's role.
sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole()
{
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index 7c31aee85a78..b2e76fd70074 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -176,10 +176,4 @@ OUString
return sName;
}
-OUString
- AccessibleOLEShape::CreateAccessibleDescription()
-{
- return CreateAccessibleName ();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index f21e3a5b2f8b..c889a79e31ad 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -201,22 +201,6 @@ void DescriptionGenerator::AddFillProperties()
}
-void DescriptionGenerator::Add3DProperties()
-{
- AddProperty ("D3DMaterialColor", DescriptionGenerator::PropertyType::Color,
- RID_SVXSTR_A11Y_3D_MATERIAL_COLOR);
- AddLineProperties ();
- AddFillProperties ();
-}
-
-
-void DescriptionGenerator::AddTextProperties()
-{
- AddProperty ("CharColor", DescriptionGenerator::PropertyType::Color);
- AddFillProperties ();
-}
-
-
/** Search for the given color in the global color table. If found append
its name to the description. Otherwise append its RGB tuple.
*/
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 3a187016fb39..5091c905063f 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -72,7 +72,6 @@
//TODO: remove this and calculate off the actual size of text, not
//an arbitrary number of characters
#define TEXT_WIDTH 80
-#define ISITEMSET rSet.GetItemState(nWhich)>=SfxItemState::DEFAULT
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -580,17 +579,6 @@ const SvxFont& SvxFontPrevWindow::GetFont() const
return pImpl->maFont;
}
-void SvxFontPrevWindow::SetPreviewText( const OUString& rString )
-{
- pImpl->maText = rString;
- pImpl->mbTextInited = true;
-}
-
-void SvxFontPrevWindow::SetFontNameAsPreviewText()
-{
- pImpl->mbUseFontNameAsText = true;
-}
-
void SvxFontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont& rCJKOutFont, const SvxFont& rCTLFont )
{
setFont(rNormalOutFont, pImpl->maFont);
@@ -827,20 +815,6 @@ void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n )
Invalidate();
}
-void SvxFontPrevWindow::AutoCorrectFontColor()
-{
- Color aFontColor( GetTextColor() );
-
- if (COL_AUTO == pImpl->maFont.GetColor())
- pImpl->maFont.SetColor(aFontColor);
-
- if (COL_AUTO == pImpl->maCJKFont.GetColor())
- pImpl->maCJKFont.SetColor(aFontColor);
-
- if (COL_AUTO == pImpl->maCTLFont.GetColor())
- pImpl->maCTLFont.SetColor(aFontColor);
-}
-
static bool GetWhich (const SfxItemSet& rSet, sal_uInt16 nSlot, sal_uInt16& rWhich)
{
rWhich = rSet.GetPool()->GetWhich(nSlot);
@@ -877,33 +851,6 @@ static void SetPrevFontStyle( const SfxItemSet& rSet, sal_uInt16 nPosture, sal_u
}
}
-void SvxFontPrevWindow::SetFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont )
-{
- sal_uInt16 nWhich;
- long nH;
- if (GetWhich(rSet, nSlot, nWhich))
- {
- nH = LogicToLogic(static_cast<const SvxFontHeightItem&>(rSet.Get(nWhich)).GetHeight(),
- rSet.GetPool()->GetMetric(nWhich),
- MapUnit::MapTwip);
- }
- else
- nH = 240;// as default 12pt
-
- rFont.SetFontSize(Size(0, nH));
-}
-
-void SvxFontPrevWindow::SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont)
-{
- sal_uInt16 nWhich;
- LanguageType nLang;
- if( GetWhich( rSet, nSlot, nWhich ) )
- nLang = static_cast<const SvxLanguageItem&>(rSet.Get(nWhich)).GetLanguage();
- else
- nLang = LANGUAGE_NONE;
- rFont.SetLanguage(nLang);
-}
-
static void SetPrevFontEscapement(SvxFont& rFont, sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc)
{
rFont.SetPropr(nProp);
@@ -911,66 +858,6 @@ static void SetPrevFontEscapement(SvxFont& rFont, sal_uInt8 nProp, sal_uInt8 nEs
rFont.SetEscapement(nEsc);
}
-void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont )
-{
- sal_uInt16 nWhich = rSet.GetPool()->GetWhich( nSlot );
- if( ISITEMSET )
- {
- const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>( rSet.Get(nWhich) );
- rFont.SetFamily( rFontItem.GetFamily() );
- rFont.SetFamilyName( rFontItem.GetFamilyName() );
- rFont.SetPitch( rFontItem.GetPitch() );
- rFont.SetCharSet( rFontItem.GetCharSet() );
- rFont.SetStyleName( rFontItem.GetStyleName() );
- }
-}
-
-void SvxFontPrevWindow::SetFontStyle( const SfxItemSet& rSet, sal_uInt16 nPosture, sal_uInt16 nWeight, SvxFont& rFont )
-{
- sal_uInt16 nWhich = rSet.GetPool()->GetWhich( nPosture );
- if( ISITEMSET )
- {
- const SvxPostureItem& rItem = static_cast<const SvxPostureItem&>( rSet.Get( nWhich ) );
- rFont.SetItalic( rItem.GetValue() != ITALIC_NONE ? ITALIC_NORMAL : ITALIC_NONE );
- }
-
- nWhich = rSet.GetPool()->GetWhich( nWeight );
- if( ISITEMSET )
- {
- const SvxWeightItem& rItem = static_cast<const SvxWeightItem&>( rSet.Get( nWhich ) );
- rFont.SetWeight( rItem.GetValue() != WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL );
- }
-}
-
-void SvxFontPrevWindow::SetFontWidthScale( const SfxItemSet& rSet )
-{
- sal_uInt16 nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_SCALEWIDTH );
- if( ISITEMSET )
- {
- const SvxCharScaleWidthItem& rItem = static_cast<const SvxCharScaleWidthItem&>( rSet.Get( nWhich ) );
-
- SetFontWidthScale( rItem.GetValue() );
- }
-}
-
-namespace
-{
- void setFontEscapement(SvxFont& rFont, sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc)
- {
- rFont.SetPropr(nProp);
- rFont.SetProprRel(nEscProp);
- rFont.SetEscapement(nEsc);
- }
-}
-
-void SvxFontPrevWindow::SetFontEscapement(sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc)
-{
- setFontEscapement(GetFont(), nProp, nEscProp, nEsc);
- setFontEscapement(GetCJKFont(), nProp, nEscProp, nEsc);
- setFontEscapement(GetCTLFont(), nProp, nEscProp, nEsc);
- Invalidate();
-}
-
Size SvxFontPrevWindow::GetOptimalSize() const
{
return getPreviewStripSize(*this);
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 5b190ed7c6ab..b99311029a92 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -837,17 +837,6 @@ void SvxLanguageComboBox::ImplSelectEntryPos( sal_Int32 nPos, bool bSelect )
}
-bool SvxLanguageBox::ImplIsEntryPosSelected( sal_Int32 nPos ) const
-{
- return IsEntryPosSelected( nPos);
-}
-
-bool SvxLanguageComboBox::ImplIsEntryPosSelected( sal_Int32 nPos ) const
-{
- return IsEntryPosSelected( nPos);
-}
-
-
sal_Int32 SvxLanguageBox::ImplGetEntryPos( const void* pData ) const
{
return GetEntryPos( pData);
generated by cgit (git 2.34.1) at 2024-12-28 21:12:18 +0000