sw/inc/numrule.hxx | 1 - sw/source/core/doc/number.cxx | 6 ------ sw/source/ui/config/fontcfg.cxx | 28 ---------------------------- sw/source/ui/inc/fontcfg.hxx | 5 ----- unusedcode.easy | 2 -- 5 files changed, 42 deletions(-)
New commits: commit 21352f88caba9dee73d5a87c8e3724d17ac6b428 Author: Cédric Bosdonnat <cedric.bosdon...@free.fr> Date: Thu Oct 20 16:47:44 2011 +0200 Sw styles cleanup: removed now unused methods diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 4401df3..0f7a3b2 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 112ffd5..220aa19 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 efc3c67..0f4d4c8 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 5acd526..3570130 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); diff --git a/unusedcode.easy b/unusedcode.easy index f7f28f0..60c838c 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1175,7 +1175,6 @@ SwLRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwLineRect SwLoadOptPage::LinkStubCaptionHdl(void*, void*) SwMailMergeChildWindow::GetChildWindowId() SwModify::GetClientCount() const -SwNumRule::GetBullIndent(unsigned char) SwOutlineNodes::Insert(SwNode* const&, unsigned short&) SwOutlineNodes::Insert(SwNode* const*, unsigned short) SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short) @@ -1210,7 +1209,6 @@ SwSortTableLines::Insert(SwTableLine* const&, unsigned short&) SwSortTableLines::Insert(SwTableLine* const*, unsigned short) SwSortTableLines::Remove(SwTableLine* const&, unsigned short) SwSortTableLines::Remove(unsigned short, unsigned short) -SwStdFontConfig::ChangeInt(unsigned short, int) SwSyncChildWin::GetChildWindowId() SwTOXMarks::DeleteAndDestroy(unsigned short, unsigned short) SwTOXSelectTabPage::LinkStubTOXAreaHdl(void*, void*)
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits