summaryrefslogtreecommitdiff
path: root/scaddins
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-01-20 11:25:52 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-01-20 11:27:16 +0000
commitb398945d08bdab0de5f22b06c91686569942e668 (patch)
treec270c29d7092fd54bc7696cc5ddfa016d0bf673d /scaddins
parent229891d6cbc24f9e6291d8057d0d51326b059d9b (diff)
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
Diffstat (limited to 'scaddins')
-rw-r--r--scaddins/source/analysis/analysishelper.hxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index caf511594259..d81017cd7821 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
{