[Libreoffice-commits] core.git: sc/qa
Stephan Bergmann
sbergman at redhat.com
Wed Dec 21 13:59:45 UTC 2016
sc/qa/unit/helper/csv_handler.hxx | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit ac5790ac43de2270b8c18e496e76efbd486aa056
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Dec 21 14:58:59 2016 +0100
No apparent reason for an unnamed namespace in an include file here
Change-Id: If93cef32c49d6fb05b45b60c6ba0a666c8858aaf
diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx
index 090de9c..a840d3e 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -26,9 +26,7 @@
#define DEBUG_CSV_HANDLER 0
-namespace {
-
-OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab)
+inline OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab)
{
OUString aString;
Color* pColor;
@@ -44,7 +42,7 @@ OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SC
return aString;
}
-OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
+inline OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
{
OStringBuffer aString("Error in Table: ");
aString.append(static_cast<sal_Int32>(nTab));
@@ -55,7 +53,7 @@ OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
return aString.makeStringAndClear();
}
-OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rExpectedString, const OUString& rString)
+inline OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rExpectedString, const OUString& rString)
{
OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
aString.append("; Expected: '");
@@ -66,7 +64,7 @@ OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& r
return aString.makeStringAndClear();
}
-OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, double aValue)
+inline OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, double aValue)
{
OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
aString.append("; Expected: '");
@@ -78,8 +76,6 @@ OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected,
}
-}
-
class csv_handler
{
public:
More information about the Libreoffice-commits
mailing list