summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2011-10-20 16:47:44 +0200
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2011-10-20 16:53:51 +0200
commit21352f88caba9dee73d5a87c8e3724d17ac6b428 (patch)
treef5e1c1201426526ad159ee5a85cc492c1a755518 /sw
parent6163c62a52794725188faf82ee12852f4b2cd023 (diff)
Sw styles cleanup: removed now unused methods
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/numrule.hxx1
-rw-r--r--sw/source/core/doc/number.cxx6
-rw-r--r--sw/source/ui/config/fontcfg.cxx28
-rw-r--r--sw/source/ui/inc/fontcfg.hxx5
4 files changed, 0 insertions, 40 deletions
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 4401df3647f3..0f7a3b23b796 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -217,7 +217,6 @@ public:
static char* GetOutlineRuleName() { return pDefOutlineName; }
static sal_uInt16 GetNumIndent( sal_uInt8 nLvl );
- static sal_uInt16 GetBullIndent( sal_uInt8 nLvl );
SwNumRuleType GetRuleType() const { return eRuleType; }
void SetRuleType( SwNumRuleType eNew ) { eRuleType = eNew;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 112ffd5bfbea..220aa19cf260 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -175,12 +175,6 @@ sal_uInt16 SwNumRule::GetNumIndent( sal_uInt8 nLvl )
return aDefNumIndents[ nLvl ];
}
-sal_uInt16 SwNumRule::GetBullIndent( sal_uInt8 nLvl )
-{
- OSL_ENSURE( MAXLEVEL > nLvl, "NumLevel is out of range" );
- return aDefNumIndents[ nLvl ];
-}
-
static void lcl_SetRuleChgd( SwTxtNode& rNd, sal_uInt8 nLevel )
{
if( rNd.GetActualListLevel() == nLevel )
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index efc3c670fb15..0f4d4c81bb19 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -292,34 +292,6 @@ sal_Int32 SwStdFontConfig::GetDefaultHeightFor(sal_uInt16 nFontType, LanguageTyp
return nRet;
}
-void SwStdFontConfig::ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight )
-{
- OSL_ENSURE( nFontType < DEF_FONT_COUNT, "invalid index in SwStdFontConfig::ChangInt()");
- if( nFontType < DEF_FONT_COUNT && nDefaultFontHeight[nFontType] != nHeight)
- {
- SvtLinguOptions aLinguOpt;
- SvtLinguConfig().GetOptions( aLinguOpt );
-
- sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
- eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
- eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
-
- // #i92090# default height value sets back to -1
- const sal_Int32 nDefaultHeight = GetDefaultHeightFor(nFontType, lcl_LanguageOfType(nFontType, eWestern, eCJK, eCTL));
- const bool bIsDefaultHeight = nHeight == nDefaultHeight;
- if( bIsDefaultHeight && nDefaultFontHeight[nFontType] > 0 )
- {
- SetModified();
- nDefaultFontHeight[nFontType] = -1;
- }
- else if( !bIsDefaultHeight && nHeight != nDefaultFontHeight[nFontType] )
- {
- SetModified();
- nDefaultFontHeight[nFontType] = nHeight;
- }
- }
-}
-
sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, LanguageType eLang )
{
OSL_ENSURE(nFont + FONT_PER_GROUP * nScriptType < DEF_FONT_COUNT, "wrong index in SwStdFontConfig::GetFontHeight()");
diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx
index 5acd526bd16e..357013021940 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/sw/source/ui/inc/fontcfg.hxx
@@ -79,8 +79,6 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem
}
}
- void ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight );
-
public:
SwStdFontConfig();
~SwStdFontConfig();
@@ -109,9 +107,6 @@ public:
void SetFontIndex (const String& rSet, sal_uInt8 nFontGroup)
{ ChangeString(FONT_INDEX + FONT_PER_GROUP * nFontGroup, rSet);}
- void SetFontHeight( sal_Int32 nHeight, sal_uInt8 nFont, sal_uInt8 nScriptType )
- { ChangeInt(nFont + FONT_PER_GROUP * nScriptType, nHeight);}
-
sal_Int32 GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, LanguageType eLang );
static String GetDefaultFor(sal_uInt16 nFontType, LanguageType eLang);