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>

1 files changed, 13 insertions, 14 deletions

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index d55aae5e16a5..68f63a8d3a25 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
@@ -29,7 +29,6 @@
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 
 namespace xmlscript
@@ -47,36 +46,36 @@ public:
     }
 
     // XInputStreamProvider
-    virtual Reference< io::XInputStream > SAL_CALL createInputStream() override;
+    virtual uno::Reference< io::XInputStream > SAL_CALL createInputStream() override;
 };
-Reference< io::XInputStream > InputStreamProvider::createInputStream()
+uno::Reference< io::XInputStream > InputStreamProvider::createInputStream()
 {
     return ::xmlscript::createInputStream( _bytes );
 }
 
-Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
-    Reference< container::XNameContainer > const & xDialogModel,
-    Reference< XComponentContext > const & xContext,
-    Reference< XModel > const & xDocument )
+uno::Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
+    uno::Reference< container::XNameContainer > const & xDialogModel,
+    uno::Reference< uno::XComponentContext > const & xContext,
+    uno::Reference< XModel > const & xDocument )
 {
-    Reference< xml::sax::XWriter > xWriter = xml::sax::Writer::create(xContext);
+    uno::Reference< xml::sax::XWriter > xWriter = xml::sax::Writer::create(xContext);
 
     std::vector<sal_Int8> aBytes;
     xWriter->setOutputStream( createOutputStream( &aBytes ) );
 
-    Reference< xml::sax::XExtendedDocumentHandler > xHandler(xWriter, UNO_QUERY_THROW);
+    uno::Reference< xml::sax::XExtendedDocumentHandler > xHandler(xWriter, uno::UNO_QUERY_THROW);
     exportDialogModel( xHandler, xDialogModel, xDocument );
 
     return new InputStreamProvider( aBytes );
 }
 
 void SAL_CALL importDialogModel(
-    Reference< io::XInputStream > const & xInput,
-    Reference< container::XNameContainer > const & xDialogModel,
-    Reference< XComponentContext > const & xContext,
-    Reference< XModel > const & xDocument )
+    uno::Reference< io::XInputStream > const & xInput,
+    uno::Reference< container::XNameContainer > const & xDialogModel,
+    uno::Reference< uno::XComponentContext > const & xContext,
+    uno::Reference< XModel > const & xDocument )
 {
-    Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext );
+    uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext );
 
     // error handler, entity resolver omitted for this helper function
     xParser->setDocumentHandler( importDialogModel( xDialogModel, xContext, xDocument ) );