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>

3 files changed, 9 insertions, 4 deletions

diff --git a/svx/inc/uiobject.hxx b/svx/inc/uiobject.hxx
index e0baae6815b0..331893520490 100644
--- a/svx/inc/uiobject.hxx
+++ b/svx/inc/uiobject.hxx
@@ -7,6 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#ifndef INCLUDED_SVX_INC_UIOBJECT_HXX
+#define INCLUDED_SVX_INC_UIOBJECT_HXX
+
 #include <memory>
 #include <vcl/uitest/uiobject.hxx>
 
@@ -32,4 +35,6 @@ protected:
     OUString get_name() const override;
 };
 
+#endif // INCLUDED_SVX_INC_UIOBJECT_HXX
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index 8376fac02cbc..59df1c3e30fb 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -25,7 +25,7 @@
 
 #include <cppuhelper/queryinterface.hxx>
 
-using namespace accessibility;
+using namespace ::accessibility;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::accessibility;
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;