sc/inc/calcconfig.hxx | 8 ++++----
sc/source/core/tool/calcconfig.cxx | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit ba80f72df4256246ca3781442a140b10f71effa0
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Nov 6 12:28:48 2014 +0200
Try to get the SC_DLLPUBLIC placement right
Change-Id: Iddf7cad771d271e848ba3abc1c144b9c313cdb99
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index aa286a0..eaaeb3f 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -66,11 +66,11 @@ struct SC_DLLPUBLIC ScCalcConfig
bool operator!= (const ScCalcConfig& r) const;
};
-std::ostream& SC_DLLPUBLIC operator<<(std::ostream& rStream, const
ScCalcConfig& rConfig);
+SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const
ScCalcConfig& rConfig);
-OUString SC_DLLPUBLIC ScOpCodeSetToNumberString(const std::set<OpCodeEnum>&
rOpCodes);
-OUString SC_DLLPUBLIC ScOpCodeSetToSymbolicString(const std::set<OpCodeEnum>&
rOpCodes);
-std::set<OpCodeEnum> SC_DLLPUBLIC ScStringToOpCodeSet(const OUString&
rOpCodes);
+SC_DLLPUBLIC OUString ScOpCodeSetToNumberString(const std::set<OpCodeEnum>&
rOpCodes);
+SC_DLLPUBLIC OUString ScOpCodeSetToSymbolicString(const std::set<OpCodeEnum>&
rOpCodes);
+SC_DLLPUBLIC std::set<OpCodeEnum> ScStringToOpCodeSet(const OUString&
rOpCodes);
#endif
diff --git a/sc/source/core/tool/calcconfig.cxx
b/sc/source/core/tool/calcconfig.cxx
index f6d2e46..46a2404 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -92,7 +92,7 @@ void writeStringSet(std::ostream& rStream, const
std::set<OUString>& rSet)
} // anonymous namespace
-std::ostream& SC_DLLPUBLIC operator<<(std::ostream& rStream, const
ScCalcConfig& rConfig)
+std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig& rConfig)
{
rStream << "{"
"StringRefAddressSyntax=" << rConfig.meStringRefAddressSyntax << ","
@@ -133,7 +133,7 @@ formula::FormulaCompiler::OpCodeMapPtr setup()
} // anonymous namespace
-OUString SC_DLLPUBLIC ScOpCodeSetToNumberString(const std::set<OpCodeEnum>&
rOpCodes)
+OUString ScOpCodeSetToNumberString(const std::set<OpCodeEnum>& rOpCodes)
{
OUStringBuffer result;
@@ -147,7 +147,7 @@ OUString SC_DLLPUBLIC ScOpCodeSetToNumberString(const
std::set<OpCodeEnum>& rOpC
return result.toString();
}
-OUString SC_DLLPUBLIC ScOpCodeSetToSymbolicString(const std::set<OpCodeEnum>&
rOpCodes)
+OUString ScOpCodeSetToSymbolicString(const std::set<OpCodeEnum>& rOpCodes)
{
OUStringBuffer result;
formula::FormulaCompiler::OpCodeMapPtr pOpCodeMap(setup());
@@ -165,7 +165,7 @@ OUString SC_DLLPUBLIC ScOpCodeSetToSymbolicString(const
std::set<OpCodeEnum>& rO
return result.toString();
}
-std::set<OpCodeEnum> SC_DLLPUBLIC ScStringToOpCodeSet(const OUString& rOpCodes)
+std::set<OpCodeEnum> ScStringToOpCodeSet(const OUString& rOpCodes)
{
std::set<OpCodeEnum> result;
formula::FormulaCompiler::OpCodeMapPtr pOpCodeMap(setup());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
