Merge branch 'master' into feature/killsdf

Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk

1 files changed, 4 insertions, 4 deletions

diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index b04f1a1ecc0d..fa506953d3d4 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -71,7 +71,7 @@ using ::rtl::OUString;
 
 static ResMgr* pSolverResMgr = NULL;
 
-OUString lcl_GetResourceString( sal_uInt32 nId )
+static OUString lcl_GetResourceString( sal_uInt32 nId )
 {
     if (!pSolverResMgr)
         pSolverResMgr = ResMgr::CreateResMgr("solver");
@@ -123,7 +123,7 @@ typedef boost::unordered_map< table::CellAddress, std::vector<double>, ScSolverC
 
 // -----------------------------------------------------------------------
 
-uno::Reference<table::XCell> lcl_GetCell( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
+static uno::Reference<table::XCell> lcl_GetCell( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
                                           const table::CellAddress& rPos )
 {
     uno::Reference<container::XIndexAccess> xSheets( xDoc->getSheets(), uno::UNO_QUERY );
@@ -131,13 +131,13 @@ uno::Reference<table::XCell> lcl_GetCell( const uno::Reference<sheet::XSpreadshe
     return xSheet->getCellByPosition( rPos.Column, rPos.Row );
 }
 
-void lcl_SetValue( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
+static void lcl_SetValue( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
                    const table::CellAddress& rPos, double fValue )
 {
     lcl_GetCell( xDoc, rPos )->setValue( fValue );
 }
 
-double lcl_GetValue( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
+static double lcl_GetValue( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
                      const table::CellAddress& rPos )
 {
     return lcl_GetCell( xDoc, rPos )->getValue();