diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-09-20 13:54:27 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-09-20 14:17:36 +0300 |
commit | 29b0c6093db08ed959022af7ee53b42b155c7fb5 (patch) | |
tree | b34ba32c91f49f4945f47892a198a69e724ecc87 | |
parent | 8e1e27ae6d0751097d276eb3394b57af123e09f3 (diff) |
Sprinkle some staticness to avoid duplicate symbols when DISABLE_DYNLOADING
Change-Id: I2d62eddb561baa28e320f7d89a8655d2806d7b10
-rw-r--r-- | sw/source/core/text/porlay.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/lingu/olmenu.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uno/unodispatch.cxx | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index d03304a28b6d..f1205dc5bcf4 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -99,7 +99,7 @@ sal_Bool isTransparentChar ( xub_Unicode cCh ) * Checks if cCh + cNectCh builds a ligature (used for Kashidas) *************************************************************************/ -sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) +static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) { // Lam + Alef return ( isLamChar ( cCh ) && isAlefChar ( cNextCh )); @@ -111,7 +111,7 @@ sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) * Checks if cCh is connectable to cPrevCh (used for Kashidas) *************************************************************************/ -sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh ) +static sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh ) { const int32_t nJoiningType = u_getIntPropertyValue( cPrevCh, UCHAR_JOINING_TYPE ); sal_Bool bRet = nJoiningType != U_JT_RIGHT_JOINING && nJoiningType != U_JT_NON_JOINING; @@ -126,7 +126,7 @@ sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh ) /************************************************************************* * lcl_HasStrongLTR *************************************************************************/ - bool lcl_HasStrongLTR ( const String& rTxt, xub_StrLen nStart, xub_StrLen nEnd ) +static bool lcl_HasStrongLTR ( const String& rTxt, xub_StrLen nStart, xub_StrLen nEnd ) { for ( xub_StrLen nCharIdx = nStart; nCharIdx < nEnd; ++nCharIdx ) { diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 4570e82b25f1..6b51d61e9217 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -102,7 +102,7 @@ extern void lcl_CharDialog( SwWrtShell &rWrtSh, sal_Bool bUseDialog, sal_uInt16 // tries to determine the language of 'rText' // -LanguageType lcl_CheckLanguage( +static LanguageType lcl_CheckLanguage( const OUString &rText, uno::Reference< linguistic2::XSpellChecker1 > xSpell, uno::Reference< linguistic2::XLanguageGuessing > xLangGuess, diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx index b45c3f57bf12..0aeb1271e92b 100644 --- a/sw/source/ui/uno/unodispatch.cxx +++ b/sw/source/ui/uno/unodispatch.cxx @@ -44,12 +44,12 @@ using namespace ::com::sun::star; using ::rtl::OUString; -const char* cURLStart = ".uno:DataSourceBrowser/"; -const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter"; -const char* cURLInsertContent = ".uno:DataSourceBrowser/InsertContent";//data into fields -const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns";//data into text -const char* cURLDocumentDataSource = ".uno:DataSourceBrowser/DocumentDataSource";//current data source of the document -const sal_Char* cInternalDBChangeNotification = ".uno::Writer/DataSourceChanged"; +static const char* cURLStart = ".uno:DataSourceBrowser/"; +static const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter"; +static const char* cURLInsertContent = ".uno:DataSourceBrowser/InsertContent";//data into fields +static const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns";//data into text +static const char* cURLDocumentDataSource = ".uno:DataSourceBrowser/DocumentDataSource";//current data source of the document +static const sal_Char* cInternalDBChangeNotification = ".uno::Writer/DataSourceChanged"; SwXDispatchProviderInterceptor::SwXDispatchProviderInterceptor(SwView& rVw) : m_pView(&rVw) |