3 files changed, 10 insertions, 6 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 1731bb2a3503..7aa1a207bede 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -98,7 +98,7 @@ struct FmGridHeaderData
     Reference< XInterface > xDroppedResultSet;
 };
 
-void SetMenuItem(const OUString& rImgID, const OString &rID, Menu& rMenu, bool bDesignMode)
+static void SetMenuItem(const OUString& rImgID, const OString &rID, Menu& rMenu, bool bDesignMode)
 {
     BitmapEx aBitmap(rImgID);
     Image aImage(aBitmap);
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 09f76a800c74..30b2aa76cfa3 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -78,7 +78,7 @@ using ::com::sun::star::sdb::XRowSetSupplier;
 using ::com::sun::star::awt::XVclWindowPeer;
 
 
-css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont )
+static css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont )
 {
     css::awt::FontDescriptor aFD;
     aFD.Name = rFont.GetFamilyName();
@@ -101,7 +101,7 @@ css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont )
 }
 
 
-vcl::Font ImplCreateFont( const css::awt::FontDescriptor& rDescr )
+static vcl::Font ImplCreateFont( const css::awt::FontDescriptor& rDescr )
 {
     vcl::Font aFont;
     aFont.SetFamilyName( rDescr.Name );
@@ -1021,7 +1021,7 @@ void FmXGridPeer::columnChanged()
 
 namespace fmgridif
 {
-    const OUString getDataModeIdentifier()
+    static const OUString getDataModeIdentifier()
     {
         return OUString("DataMode");
     }
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index a944957881d6..732699ab8f8b 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -24,7 +24,7 @@
 using namespace ::com::sun::star::uno;
 
 
-const css::uno::Sequence<OUString>& getColumnTypes()
+static const css::uno::Sequence<OUString>& getColumnTypes()
 {
     static css::uno::Sequence<OUString> aColumnTypes(10);
     if (aColumnTypes.getConstArray()[0].isEmpty())
@@ -45,12 +45,16 @@ const css::uno::Sequence<OUString>& getColumnTypes()
 }
 
 
+extern "C" {
+
 // comparison of PropertyInfo
-extern "C" int NameCompare(const void* pFirst, const void* pSecond)
+static int NameCompare(const void* pFirst, const void* pSecond)
 {
     return static_cast<OUString const *>(pFirst)->compareTo(*static_cast<OUString const *>(pSecond));
 }
 
+}
+
 namespace
 {