Kaydet (Commit) 2549be5a authored tarafından Andrzej J.R. Hunt's avatar Andrzej J.R. Hunt Kaydeden (comit) Stephan Bergmann

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: 's avatarStephan Bergmann <sbergman@redhat.com>
üst af6c43c0
...@@ -24,11 +24,13 @@ ...@@ -24,11 +24,13 @@
class SimpleResMgr; class SimpleResMgr;
#define TK_RES_STRING(id) TkResMgr::loadString(id) #define TK_RES_STRING(id) ::accessibility::TkResMgr::loadString(id)
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// TkResMgr // TkResMgr
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
namespace accessibility
{
class TkResMgr class TkResMgr
{ {
...@@ -57,6 +59,7 @@ public: ...@@ -57,6 +59,7 @@ public:
static OUString loadString( sal_uInt16 nResId ); static OUString loadString( sal_uInt16 nResId );
}; };
}
#endif // ACCESSIBILITY_HELPER_TKARESMGR_HXX #endif // ACCESSIBILITY_HELPER_TKARESMGR_HXX
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <tools/simplerm.hxx> #include <tools/simplerm.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
using namespace accessibility;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// TkResMgr // TkResMgr
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment