Revert "long->sal_Int32 in tools/gen.hxx"

This reverts commit 8bc951daf79decbd8a599a409c6d33c5456710e0.

As discussed at
<https://lists.freedesktop.org/archives/libreoffice/2018-April/079955.html>
"long->sal_Int32 in tools/gen.hxx", that commit caused lots of problems with
signed integer overflow, and the original plan was to redo it to consistently
use sal_Int64 instead of sal_Int32.  <https://gerrit.libreoffice.org/#/c/52471/>
"sal_Int32->sal_Int64 in tools/gen.hxx" tried that.  However, it failed
miserably on Windows, causing odd failures like not writing out Pictures/*.svm
streams out into .odp during CppunitTest_sd_export_ooxml2.  So the next best
approach is to just revert the original commit, at least for now.

Includes revert of follow-up 8c50aff2175e85c54957d98ce32af40a3a87e168 "Fix
Library_vclplug_qt5".

Change-Id: Ia8bf34272d1ed38aac00e5d07a9d13fb03f439ae
Reviewed-on: https://gerrit.libreoffice.org/52532
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 7ba38b159bb1..8e056acb2186 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -394,10 +394,10 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV
             aWindowData.put( "ComposedName", elem->GetComposedName() );
             aWindowData.put( "TableName", elem->GetTableName() );
             aWindowData.put( "WindowName", elem->GetWinName() );
-            aWindowData.put( "WindowTop", elem->GetPosition().Y() );
-            aWindowData.put( "WindowLeft", elem->GetPosition().X() );
-            aWindowData.put( "WindowWidth", elem->GetSize().Width() );
-            aWindowData.put( "WindowHeight", elem->GetSize().Height() );
+            aWindowData.put( "WindowTop", static_cast<sal_Int32>(elem->GetPosition().Y()) );
+            aWindowData.put( "WindowLeft", static_cast<sal_Int32>(elem->GetPosition().X()) );
+            aWindowData.put( "WindowWidth", static_cast<sal_Int32>(elem->GetSize().Width()) );
+            aWindowData.put( "WindowHeight", static_cast<sal_Int32>(elem->GetSize().Height()) );
             aWindowData.put( "ShowAll", elem->IsShowAll() );
 
             const OUString sTableName( "Table" + OUString::number( i++ ) );