sc/source/ui/unoobj/dispuno.cxx | 4 ++--
stoc/source/corereflection/crefl.cxx | 5 +++++
sw/source/core/text/porlay.cxx | 6 +++---
sw/source/ui/lingu/olmenu.cxx | 2 +-
sw/source/ui/uno/unodispatch.cxx | 12 ++++++------
xmloff/source/style/XMLBackgroundImageContext.cxx | 4 ++--
6 files changed, 19 insertions(+), 14 deletions(-)
New commits:
commit e7c9b468f364fd4796f0ff6fc6b76045ad58b26f
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Sep 20 14:05:17 2012 +0300
Add some static goodness here, too
Change-Id: I7de335925748b2cfe28a01f6975a630081b3172e
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 7d0c2e9..9ca3481 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -45,8 +45,8 @@ using namespace com::sun::star;
//------------------------------------------------------------------------
-const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns"; //data
into text
-const char* cURLDocDataSource = ".uno:DataSourceBrowser/DocumentDataSource";
+static const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns";
//data into text
+static const char* cURLDocDataSource =
".uno:DataSourceBrowser/DocumentDataSource";
//------------------------------------------------------------------------
commit fed4ca185bc2fa29b915e6ea63b0bf7aeec29e5f
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Sep 20 13:56:26 2012 +0300
Sprinkle some staticness to avoid duplicate symbols when DISABLE_DYNLOADING
Change-Id: I9c5203400904902238c1f9a8f01338fdcf2904d8
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx
b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 3c46600..ae1e77b 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -82,14 +82,14 @@ const SvXMLTokenMapEntry*
lcl_getBGImgAttributesAttrTokenMap()
-SvXMLEnumMapEntry psXML_BrushHoriPos[] =
+static SvXMLEnumMapEntry psXML_BrushHoriPos[] =
{
{ XML_LEFT, GraphicLocation_LEFT_MIDDLE },
{ XML_RIGHT, GraphicLocation_RIGHT_MIDDLE },
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry psXML_BrushVertPos[] =
+static SvXMLEnumMapEntry psXML_BrushVertPos[] =
{
{ XML_TOP, GraphicLocation_MIDDLE_TOP },
{ XML_BOTTOM, GraphicLocation_MIDDLE_BOTTOM },
commit c672b1f43c64e5f411badc2deb2d39a7c0fe6373
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Sep 20 13:55:38 2012 +0300
No point with component_canUnload when DISABLE_DYNLOADING
Change-Id: I85016d1e70dbb5e499aefad568179800b5d00ab7
diff --git a/stoc/source/corereflection/crefl.cxx
b/stoc/source/corereflection/crefl.cxx
index 1af1b3a..3357a54 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -464,11 +464,16 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
+
+#ifndef DISABLE_DYNLOADING
+
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
+#endif
+
//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL reflection_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
commit 29b0c6093db08ed959022af7ee53b42b155c7fb5
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Sep 20 13:54:27 2012 +0300
Sprinkle some staticness to avoid duplicate symbols when DISABLE_DYNLOADING
Change-Id: I2d62eddb561baa28e320f7d89a8655d2806d7b10
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index d03304a..f1205dc 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 4570e82..6b51d61 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 b45c3f5..0aeb127 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
