scaddins/source/analysis/analysishelper.hxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit b398945d08bdab0de5f22b06c91686569942e668
Author: Michael Meeks <michael.me...@collabora.com>
Date: Tue Jan 20 11:25:52 2015 +0000
scaddins: quick fix for conflict on ConvertData.
Also used by VCL image plugins - defer the rest to an easy-hack.
Mostly impacts mobile which uses scaddins linked without a map file.
Change-Id: I49fd40146905f4de42c9b0e7355ab89689c776bf
diff --git a/scaddins/source/analysis/analysishelper.hxx
b/scaddins/source/analysis/analysishelper.hxx
index caf5115..d81017c 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -448,6 +448,7 @@ enum ConvertDataClass
class ConvertDataList;
+namespace analysis {
class ConvertData
{
@@ -484,6 +485,9 @@ public:
inline bool IsPrefixSupport( void ) const;
};
+} // namespace analysis
+
+using namespace ::analysis;
class ConvertDataLinear : public ConvertData
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
