From fe9a5a4b4ac260ebe7c582d2923f926ab9d9f294 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 21 Dec 2016 15:08:24 +0100 Subject: ODR violation (base class must be the same across compilation units) Change-Id: Ieb98d8984c8d39fb72afbceccca29a2d402dc41e --- sdext/source/presenter/PresenterHelpView.hxx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'sdext/source/presenter/PresenterHelpView.hxx') diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index ee50c4c6fea5..3e068e484da7 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -31,18 +31,16 @@ #include #include -namespace { - typedef cppu::WeakComponentImplHelper< - css::drawing::framework::XView, - css::awt::XWindowListener, - css::awt::XPaintListener - > PresenterHelpViewInterfaceBase; -} - namespace sdext { namespace presenter { class PresenterButton; +typedef cppu::WeakComponentImplHelper< + css::drawing::framework::XView, + css::awt::XWindowListener, + css::awt::XPaintListener + > PresenterHelpViewInterfaceBase; + /** Show help text that describes the defined keys. */ class PresenterHelpView -- cgit