diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-08-28 22:59:42 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2017-08-29 08:05:48 +0200 |
commit | 9420391cc9f6af2a16c1db72596f277439df29e9 (patch) | |
tree | 28057bc71bc8c380a1df551f7601cff3e51920d0 | |
parent | 53587dc7969b023416d865b516b7e800fc5de33a (diff) |
svx: Mark functions as local
Change-Id: I15498d3d2b80b20cfae35ce6b304fd83ce8f5083
Reviewed-on: https://gerrit.libreoffice.org/41641
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
-rw-r--r-- | svx/source/dialog/langbox.cxx | 3 | ||||
-rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/Palette.cxx | 4 |
4 files changed, 14 insertions, 3 deletions
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index d36c93db7d7c..bc7ac82bee9a 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -177,6 +177,7 @@ SvxLanguageBoxBase::~SvxLanguageBoxBase() { } +namespace { bool lcl_isPrerequisite( LanguageType nLangType, SvxLanguageListFlags nLangList ) { @@ -201,6 +202,8 @@ bool lcl_isScriptTypeRequested( LanguageType nLangType, SvxLanguageListFlags nLa (SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType) == SvtScriptType::ASIAN)); } +} + void SvxLanguageBoxBase::AddLanguages( const std::vector< LanguageType >& rLanguageTypes, SvxLanguageListFlags nLangList ) { diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index e21778be3705..0b97abe3bbb6 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -63,6 +63,8 @@ using namespace com::sun::star::style; namespace svx { namespace sidebar { +namespace { + const vcl::Font& lcl_GetDefaultBulletFont() { static bool bInit = false; @@ -79,7 +81,7 @@ const vcl::Font& lcl_GetDefaultBulletFont() return aDefBulletFont; } -static const sal_Unicode aDefaultBulletTypes[] = +const sal_Unicode aDefaultBulletTypes[] = { 0x2022, 0x25cf, @@ -121,6 +123,8 @@ NumSettings_Impl* lcl_CreateNumberingSettingsPtr(const Sequence<PropertyValue>& return pNew; } +} + sal_uInt16 NBOTypeMgrBase:: IsSingleLevel(sal_uInt16 nCurLevel) { sal_uInt16 nLv = (sal_uInt16)0xFFFF; diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index ab28ff0c69c0..2f25d6afc23f 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -166,6 +166,8 @@ SdrPageView* SdrObjEditView::ShowSdrPage(SdrPage* pPage) return pPageView; } +namespace { + /// Removes outliner views registered in other draw views that use pOutputDevice. void lcl_RemoveTextEditOutlinerViews(SdrObjEditView const * pThis, SdrPageView const * pPageView, OutputDevice const * pOutputDevice) { @@ -197,6 +199,8 @@ void lcl_RemoveTextEditOutlinerViews(SdrObjEditView const * pThis, SdrPageView c } } +} + void SdrObjEditView::HideSdrPage() { lcl_RemoveTextEditOutlinerViews(this, GetSdrPageView(), GetFirstOutputDevice()); diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx index 348079cec815..b7fd0dc075a7 100644 --- a/svx/source/tbxctrls/Palette.cxx +++ b/svx/source/tbxctrls/Palette.cxx @@ -172,7 +172,7 @@ void PaletteASE::LoadPalette() // PaletteGPL ------------------------------------------------------------------ -OString lcl_getToken(const OString& rStr, sal_Int32& index); +static OString lcl_getToken(const OString& rStr, sal_Int32& index); PaletteGPL::PaletteGPL( const OUString &rFPath, const OUString &rFName ) : mbLoadedPalette( false ), @@ -287,7 +287,7 @@ void PaletteGPL::LoadPalette() // finds first token in rStr from index, separated by whitespace // returns position of next token in index -OString lcl_getToken(const OString& rStr, sal_Int32& index) +static OString lcl_getToken(const OString& rStr, sal_Int32& index) { sal_Int32 substart, toklen = 0; OUString aWhitespaceChars( " \n\t" ); |