8 files changed, 16 insertions, 20 deletions
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 3aec56767f60..894e665cf9fc 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -85,9 +85,7 @@ namespace utl
         aDataType = _rType;
     }
 
-    #ifndef UNX
     static
-    #endif
     void lcl_copyData( const NodeValueAccessor& _rAccessor, const Any& _rData, ::osl::Mutex& _rMutex )
     {
         ::osl::MutexGuard aGuard( _rMutex );
@@ -118,9 +116,7 @@ namespace utl
         }
     }
 
-    #ifndef UNX
     static
-    #endif
     void lcl_copyData( Any& _rData, const NodeValueAccessor& _rAccessor, ::osl::Mutex& _rMutex )
     {
         ::osl::MutexGuard aGuard( _rMutex );
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 0a74a321825a..259cbef80702 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -147,7 +147,7 @@ static PathToDefaultMapping_Impl const PathMap_Impl[] =
 
 // functions -------------------------------------------------------------
 
-Sequence< OUString > GetDefaultPropertyNames()
+static Sequence< OUString > GetDefaultPropertyNames()
 {
     static const char* aPropNames[] =
     {
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index a8a28b002ce5..535ad64b870b 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -161,15 +161,15 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp
     }
 }
 
-OUString getGroupPath( const OUString& _rGroup )
+static OUString getGroupPath( const OUString& _rGroup )
 {
     return OUString( ROOT_NODE "/" + _rGroup + "/" );
 }
-OUString getPagePath( const OUString& _rPage )
+static OUString getPagePath( const OUString& _rPage )
 {
     return OUString( PAGES_NODE "/" + _rPage + "/" );
 }
-OUString getOptionPath( const OUString& _rOption )
+static OUString getOptionPath( const OUString& _rOption )
 {
     return OUString( OPTIONS_NODE "/" + _rOption + "/" );
 }
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 85258c7b3cfd..19a39049e6bc 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -337,7 +337,7 @@ bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const
 #define SAVEWORKINGSET      13
 #define ODFDEFAULTVERSION   14
 
-Sequence< OUString > GetPropertyNames()
+static Sequence< OUString > GetPropertyNames()
 {
     static const char* aPropNames[] =
     {
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 62bf2b214cfd..11f09a68fe95 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1230,7 +1230,7 @@ static sal_Unicode* ImplAdd9UNum( sal_Unicode* pBuf, sal_uInt32 nNumber )
     return pBuf;
 }
 
-inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rStr )
+static inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rStr )
 {
     if ( rStr.getLength() == 1 )
         *pBuf++ = rStr[0];
@@ -1244,14 +1244,14 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rStr )
     return pBuf;
 }
 
-inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, sal_Unicode c )
+static inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, sal_Unicode c )
 {
     *pBuf = c;
     pBuf++;
     return pBuf;
 }
 
-inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBuf, sal_Int32 nLen )
+static inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBuf, sal_Int32 nLen )
 {
     memcpy( pBuf, pCopyBuf, nLen * sizeof(sal_Unicode) );
     return pBuf + nLen;
@@ -1514,7 +1514,7 @@ OUString LocaleDataWrapper::getDuration( const tools::Time& rTime, bool bSec, bo
 
 // --- simple number formatting ---------------------------------------
 
-inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal_uInt16 nDecimals )
+static inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal_uInt16 nDecimals )
 {
     // approximately 3.2 bits per digit
     const size_t nDig = ((sizeof(sal_Int64) * 8) / 3) + 1;
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 4c043c072b20..608a424f0f01 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1201,7 +1201,7 @@ StarSymbolToMSMultiFontImpl::StarSymbolToMSMultiFontImpl()
     }
 }
 
-const char *SymbolFontToString(int nResult)
+static const char *SymbolFontToString(int nResult)
 {
     const char * const *ppName = aSymbolNames;
     int nI = Symbol;
diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx
index 05e6a6131518..d336af5dcb22 100644
--- a/unotools/source/ucbhelper/progresshandlerwrap.cxx
+++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx
@@ -31,7 +31,7 @@ ProgressHandlerWrap::ProgressHandlerWrap( css::uno::Reference< css::task::XStatu
 {
 }
 
-bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum )
+static bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum )
 {
     bool bNumIsSet = false;
 
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index d42df0c78be9..9b8d7a957c2d 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -52,7 +52,7 @@ namespace
 namespace utl
 {
 
-OUString getParentName( const OUString& aFileName )
+static OUString getParentName( const OUString& aFileName )
 {
     sal_Int32 lastIndex = aFileName.lastIndexOf( '/' );
     OUString aParent;
@@ -71,7 +71,7 @@ OUString getParentName( const OUString& aFileName )
     return aParent;
 }
 
-bool ensuredir( const OUString& rUnqPath )
+static bool ensuredir( const OUString& rUnqPath )
 {
     OUString aPath;
     if ( rUnqPath.isEmpty() )
@@ -115,7 +115,7 @@ bool ensuredir( const OUString& rUnqPath )
     return bSuccess;
 }
 
-OUString ConstructTempDir_Impl( const OUString* pParent )
+static OUString ConstructTempDir_Impl( const OUString* pParent )
 {
     OUString aName;
     if ( pParent && !pParent->isEmpty() )
@@ -239,7 +239,7 @@ namespace
     };
 };
 
-OUString lcl_createName(
+static OUString lcl_createName(
     const OUString& rLeadingChars, Tokens & tokens, const OUString* pExtension,
     const OUString* pParent, bool bDirectory, bool bKeep, bool bLock,
     bool bCreateParentDirs )
@@ -314,7 +314,7 @@ OUString lcl_createName(
     return OUString();
 }
 
-OUString CreateTempName_Impl( const OUString* pParent, bool bKeep, bool bDir = true )
+static OUString CreateTempName_Impl( const OUString* pParent, bool bKeep, bool bDir = true )
 {
     OUString aEyeCatcher = "lu";
 #ifdef UNX