diff options
Diffstat (limited to 'svtools/source/control/ctrltool.cxx')
| -rw-r--r--[-rwxr-xr-x] | svtools/source/control/ctrltool.cxx | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 1314f416eec6..e65614a2c26f 100755..100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,6 +38,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> +#include <sal/macros.h> #include <svtools/svtools.hrc> #include <svtools/svtdata.hxx> #include <svtools/ctrltool.hxx> @@ -44,7 +46,7 @@ // ======================================================================= // Standard Fontgroessen fuer scalierbare Fonts -static long aStdSizeAry[] = +static const long aStdSizeAry[] = { 60, 70, @@ -120,8 +122,6 @@ private: ImplFontListNameInfo( const XubString& rSearchName ) : maSearchName( rSearchName ) {} - - const XubString& GetSearchName() const { return maSearchName; } }; // ======================================================================= @@ -870,7 +870,7 @@ struct ImplFSNameItem //------------------------------------------------------------------------ -static ImplFSNameItem aImplSimplifiedChinese[] = +static const ImplFSNameItem aImplSimplifiedChinese[] = { { 50, "\xe5\x85\xab\xe5\x8f\xb7" }, { 55, "\xe4\xb8\x83\xe5\x8f\xb7" }, @@ -890,30 +890,6 @@ static ImplFSNameItem aImplSimplifiedChinese[] = { 420, "\xe5\x88\x9d\xe5\x8f\xb7" } }; -// ----------------------------------------------------------------------- - -#if 0 // #i89077# disabled by popular request -static ImplFSNameItem aImplTraditionalChinese[] = -{ - { 50, "\xe5\x85\xab\xe8\x99\x9f" }, - { 55, "\xe4\xb8\x83\xe8\x99\x9f" }, - { 65, "\xe5\xb0\x8f\xe5\x85\xad" }, - { 75, "\xe5\x85\xad\xe8\x99\x9f" }, - { 90, "\xe5\xb0\x8f\xe4\xba\x94" }, - { 105, "\xe4\xba\x94\xe8\x99\x9f" }, - { 120, "\xe5\xb0\x8f\xe5\x9b\x9b" }, - { 140, "\xe5\x9b\x9b\xe8\x99\x9f" }, - { 150, "\xe5\xb0\x8f\xe4\xb8\x89" }, - { 160, "\xe4\xb8\x89\xe8\x99\x9f" }, - { 180, "\xe5\xb0\x8f\xe4\xba\x8c" }, - { 220, "\xe4\xba\x8c\xe8\x99\x9f" }, - { 240, "\xe5\xb0\x8f\xe4\xb8\x80" }, - { 260, "\xe4\xb8\x80\xe8\x99\x9f" }, - { 360, "\xe5\xb0\x8f\xe5\x88\x9d" }, - { 420, "\xe5\x88\x9d\xe8\x99\x9f" } -}; -#endif - //------------------------------------------------------------------------ FontSizeNames::FontSizeNames( LanguageType eLanguage ) @@ -928,7 +904,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage ) case LANGUAGE_CHINESE: case LANGUAGE_CHINESE_SIMPLIFIED: mpArray = aImplSimplifiedChinese; - mnElem = sizeof(aImplSimplifiedChinese) / sizeof(aImplSimplifiedChinese[0]); + mnElem = SAL_N_ELEMENTS(aImplSimplifiedChinese); break; #if 0 // #i89077# disabled by popular request @@ -937,7 +913,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage ) case LANGUAGE_CHINESE_MACAU: case LANGUAGE_CHINESE_TRADITIONAL: mpArray = aImplTraditionalChinese; - mnElem = sizeof(aImplTraditionalChinese) / sizeof(aImplTraditionalChinese[0]); + mnElem = SAL_N_ELEMENTS(aImplTraditionalChinese); break; #endif @@ -1009,3 +985,5 @@ long FontSizeNames::GetIndexSize( sal_uLong nIndex ) const return 0; return mpArray[nIndex].mnSize; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |