diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-11-14 16:33:23 +0000 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-15 10:31:35 +0100 |
| commit | 2549be5a75ef2a17e56d5392f6c1592275abf65e (patch) | |
| tree | 847d616162686a5ac6f02706be77b19e5f8ea18d /accessibility | |
| parent | af6c43c023e9401fd2df9c637bf76096a3e05b9d (diff) | |
Add namespace to accessbility's TkResMgr.
Previously this conflicted with include/toolkit/helper/tkresmgr.hxx,
breaking the Android build.
Change-Id: I195e18e42a5978fd7d415a8afaa007b3bee33190
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/accessibility/helper/accresmgr.hxx | 5 | ||||
| -rw-r--r-- | accessibility/source/helper/accresmgr.cxx | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx b/accessibility/inc/accessibility/helper/accresmgr.hxx index e363590c3093..261976f076b1 100644 --- a/accessibility/inc/accessibility/helper/accresmgr.hxx +++ b/accessibility/inc/accessibility/helper/accresmgr.hxx @@ -24,11 +24,13 @@ class SimpleResMgr; -#define TK_RES_STRING(id) TkResMgr::loadString(id) +#define TK_RES_STRING(id) ::accessibility::TkResMgr::loadString(id) // ----------------------------------------------------------------------------- // TkResMgr // ----------------------------------------------------------------------------- +namespace accessibility +{ class TkResMgr { @@ -57,6 +59,7 @@ public: static OUString loadString( sal_uInt16 nResId ); }; +} #endif // ACCESSIBILITY_HELPER_TKARESMGR_HXX diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index 5487bda2686f..953ebde4a679 100644 --- a/accessibility/source/helper/accresmgr.cxx +++ b/accessibility/source/helper/accresmgr.cxx @@ -22,7 +22,7 @@ #include <tools/simplerm.hxx> #include <vcl/svapp.hxx> - +using namespace accessibility; // ----------------------------------------------------------------------------- // TkResMgr // ----------------------------------------------------------------------------- |