summaryrefslogtreecommitdiff
path: root/svx/source/inc/GraphCtlAccessibleContext.hxx
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-09-20 20:04:51 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-09-22 20:52:34 +0200
commitbb406680cebd6fa1e1bdb9e2de430cd9a1f44da0 (patch)
treee9a843090a3b8842792f1b45cb31d6c415e613d8 /svx/source/inc/GraphCtlAccessibleContext.hxx
parentca8a4c81a4194cfaa526bd8071a2243aad0f3461 (diff)
Put definition of _CRT_RAND_S into bin/update_pch
so it doesn't get removed again from sal/inc/pch/precompiled_sal.hxx (see commit 4af9612f2be9e023e762831207cbdb1d5f25906f). Also make necessary changes to some of the files that start to fail building after running bin/update_pch.sh, so that the patch is self-contained and leaves the tree in fully functional state. tools namespace had to be prepended with :: to disambiguate from drawinglayer::tools vcl/inc/window.h includes were amended, because ExtTextInputAttr is from vcl/commandevent.hxx, and enum class ShowTrackFlags is from vcl/window.hxx Change-Id: I47179622350754cba2f95d26a1bafd3dfbbc935b Reviewed-on: https://gerrit.libreoffice.org/42559 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx/source/inc/GraphCtlAccessibleContext.hxx')
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 3520d1cd5e0a..1deeeee4c3bf 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -78,7 +78,7 @@ typedef ::cppu::WeakAggComponentImplHelper7<
class SvxGraphCtrlAccessibleContext:
private cppu::BaseMutex, public SvxGraphCtrlAccessibleContext_Base,
- public SfxListener, public accessibility::IAccessibleViewForwarder
+ public SfxListener, public ::accessibility::IAccessibleViewForwarder
{
public:
friend class GraphCtrl;
@@ -194,7 +194,7 @@ private:
css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessible( const SdrObject* pObj );
- accessibility::AccessibleShapeTreeInfo maTreeInfo;
+ ::accessibility::AccessibleShapeTreeInfo maTreeInfo;
/// Reference to the parent object.
css::uno::Reference<css::accessibility::XAccessible> mxParent;
@@ -209,7 +209,7 @@ private:
OUString msName;
/// map of accessible shapes
- typedef ::std::map< const SdrObject*, rtl::Reference<accessibility::AccessibleShape> > ShapesMapType;
+ typedef ::std::map< const SdrObject*, rtl::Reference<::accessibility::AccessibleShape> > ShapesMapType;
ShapesMapType mxShapes;
VclPtr<GraphCtrl> mpControl;