unotools: Internalize ucblockbytes.hxx header

Change-Id: I1a9b795eda832673a83a426c8bf10d5bb9c28581

9 files changed, 7 insertions, 11 deletions

diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index afae348e5a93..88296deed672 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -204,8 +204,7 @@ void OFileTable::dropColumn(sal_Int32 /*_nPos*/)
 
 SvStream* OFileTable::createStream_simpleError( const OUString& _rFileName, StreamMode _eOpenMode)
 {
-    utl::UcbLockBytesHandler* p_null_dummy = NULL;
-    SvStream* pReturn = ::utl::UcbStreamHelper::CreateStream( _rFileName, _eOpenMode, (_eOpenMode & STREAM_NOCREATE) == STREAM_NOCREATE, p_null_dummy);
+    SvStream* pReturn = ::utl::UcbStreamHelper::CreateStream( _rFileName, _eOpenMode, (_eOpenMode & STREAM_NOCREATE) == STREAM_NOCREATE);
     if (pReturn && (ERRCODE_NONE != pReturn->GetErrorCode()))
     {
         delete pReturn;
diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx
index 18893ee34813..173b0b9e74ab 100644
--- a/forms/inc/pch/precompiled_frm.hxx
+++ b/forms/inc/pch/precompiled_frm.hxx
@@ -347,7 +347,6 @@
 #include <unotools/streamhelper.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/textsearch.hxx>
-#include <unotools/ucblockbytes.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/cvtgrf.hxx>
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 02e3c626072b..8090dc05296d 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -70,12 +70,12 @@
 #include <rtl/math.hxx>
 #include <rtl/tencinfo.h>
 #include <svl/inettype.hxx>
+#include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/inetmsg.hxx>
 #include <tools/inetstrm.hxx>
 #include <tools/urlobj.hxx>
-#include <unotools/ucblockbytes.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index f94b32e4cabf..a770c5aaff4d 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -26,7 +26,6 @@
 #include "componenttools.hxx"
 
 #include <svtools/imageresourceaccess.hxx>
-#include <unotools/ucblockbytes.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <com/sun/star/awt/PopupMenu.hpp>
 #include <com/sun/star/awt/XPopupMenu.hpp>
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index f941479d2f8b..39cfe314fd17 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -739,7 +739,6 @@
 #include <unotools/syslocaleoptions.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbhelper.hxx>
-#include <unotools/ucblockbytes.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/viewoptions.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a80454d64e09..9260fea0e9d8 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -88,8 +88,8 @@
 #include <comphelper/storagehelper.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <comphelper/docpasswordhelper.hxx>
+#include <tools/datetime.hxx>
 #include <tools/inetmime.hxx>
-#include <unotools/ucblockbytes.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/asynclink.hxx>
 #include <svl/inettype.hxx>
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index b7c9bef518bd..1d38f4aa82e3 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -17,8 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <ucblockbytes.hxx>
+
 #include <sal/macros.h>
-#include <unotools/ucblockbytes.hxx>
 #include <comphelper/processfactory.hxx>
 #include <salhelper/condition.hxx>
 #include <osl/thread.hxx>
diff --git a/include/unotools/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index a5a08751b20a..abf8c5b0b77e 100644
--- a/include/unotools/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <unotools/unotoolsdllapi.h>
 
 #include <osl/thread.hxx>
 #include <osl/conditn.hxx>
@@ -90,7 +89,7 @@ public:
 
 typedef tools::SvRef<UcbLockBytesHandler> UcbLockBytesHandlerRef;
 
-class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes
+class UcbLockBytes : public virtual SvLockBytes
 {
     osl::Condition          m_aInitialized;
     osl::Condition          m_aTerminated;
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 3aea7c03f3f9..aa8f12dcd58f 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <rtl/ustring.hxx>
-#include <unotools/ucblockbytes.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
@@ -29,6 +28,7 @@
 
 #include <ucbhelper/content.hxx>
 #include <unotools/streamwrap.hxx>
+#include <ucblockbytes.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;