[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 99e632b Fixed typos, removed whitespace
99e632b is described below
commit 99e632bc7c95db821d42b4075be8174711f27490
Author: mseidel
AuthorDate: Fri Dec 4 22:25:56 2020 +0100
Fixed typos, removed whitespace
(cherry picked from commit 41e09fa92c50065ecf599158644193ba71ae5561)
---
main/dtrans/source/win32/dnd/source.cxx | 159
main/dtrans/source/win32/dnd/source.hxx | 68 +++---
main/dtrans/source/win32/dnd/target.cxx | 141 ++--
main/dtrans/source/win32/dnd/target.hxx | 95 +--
4 files changed, 230 insertions(+), 233 deletions(-)
diff --git a/main/dtrans/source/win32/dnd/source.cxx
b/main/dtrans/source/win32/dnd/source.cxx
index 07aceb1..e7020b4 100644
--- a/main/dtrans/source/win32/dnd/source.cxx
+++ b/main/dtrans/source/win32/dnd/source.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -75,7 +75,7 @@ DragSource::DragSource( const
Reference& sf):
// m_pcurrentContext_impl(0),
m_hAppWindow(0),
m_MouseButton(0),
-m_RunningDndOperationCount(0)
+ m_RunningDndOperationCount(0)
{
g_moduleCount.modCnt.acquire( _moduleCount.modCnt );
}
@@ -90,23 +90,23 @@ DragSource::~DragSource()
//
/** First start a new drag and drop thread if
- the last one has finished
+ the last one has finished
-
- Do we really need a separate thread for
- every Dnd opeartion or only if the source
- thread is an MTA thread
-
+
+ Do we really need a separate thread for
+ every Dnd operation or only if the source
+ thread is an MTA thread
+
*/
void DragSource::StartDragImpl(
-const DragGestureEvent& trigger,
-sal_Int8 sourceActions,
-sal_Int32 /*cursor*/,
-sal_Int32 /*image*/,
-const Reference& trans,
-const Reference& listener )
+ const DragGestureEvent& trigger,
+ sal_Int8 sourceActions,
+ sal_Int32 /*cursor*/,
+ sal_Int32 /*image*/,
+ const Reference& trans,
+ const Reference& listener )
{
-// The actions supported by the drag source
+ // The actions supported by the drag source
m_sourceActions= sourceActions;
// We need to know which mouse button triggered the operation.
// If it was the left one, then the drop occurs when that button
@@ -132,26 +132,26 @@ void DragSource::StartDragImpl(
g_XTransferable = trans;
//<-- TRA
-m_spDataObject= m_aDataConverter.createDataObjFromTransferable(
+ m_spDataObject= m_aDataConverter.createDataObjFromTransferable(
m_serviceFactory, trans);
// Obtain the id of the thread that created the window
DWORD processId;
m_threadIdWindow= GetWindowThreadProcessId( m_hAppWindow, );
-// hold the instance for the DnD thread, it's to late
-// to acquire at the start of the thread procedure
-// the thread procedure is responsible for the release
-acquire();
+ // hold the instance for the DnD thread, it's to late
+ // to acquire at the start of the thread procedure
+ // the thread procedure is responsible for the release
+ acquire();
- // The thread acccesses members of this instance but does not call
acquire.
+ // The thread accesses members of this instance but does not call
acquire.
// Hopefully this instance is not destroyed before the thread has
terminated.
unsigned threadId;
HANDLE hThread= reinterpret_cast(_beginthreadex(
-0, 0, DndOleSTAFunc, reinterpret_cast(this), 0, ));
+ 0, 0, DndOleSTAFunc, reinterpret_cast(this), 0,
));
-// detach from thread
-CloseHandle(hThread);
+
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 41e09fa Fixed typos, removed whitespace
41e09fa is described below
commit 41e09fa92c50065ecf599158644193ba71ae5561
Author: mseidel
AuthorDate: Fri Dec 4 22:25:56 2020 +0100
Fixed typos, removed whitespace
---
main/dtrans/source/win32/dnd/source.cxx | 159
main/dtrans/source/win32/dnd/source.hxx | 68 +++---
main/dtrans/source/win32/dnd/target.cxx | 141 ++--
main/dtrans/source/win32/dnd/target.hxx | 95 +--
4 files changed, 230 insertions(+), 233 deletions(-)
diff --git a/main/dtrans/source/win32/dnd/source.cxx
b/main/dtrans/source/win32/dnd/source.cxx
index 07aceb1..e7020b4 100644
--- a/main/dtrans/source/win32/dnd/source.cxx
+++ b/main/dtrans/source/win32/dnd/source.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -75,7 +75,7 @@ DragSource::DragSource( const
Reference& sf):
// m_pcurrentContext_impl(0),
m_hAppWindow(0),
m_MouseButton(0),
-m_RunningDndOperationCount(0)
+ m_RunningDndOperationCount(0)
{
g_moduleCount.modCnt.acquire( _moduleCount.modCnt );
}
@@ -90,23 +90,23 @@ DragSource::~DragSource()
//
/** First start a new drag and drop thread if
- the last one has finished
+ the last one has finished
-
- Do we really need a separate thread for
- every Dnd opeartion or only if the source
- thread is an MTA thread
-
+
+ Do we really need a separate thread for
+ every Dnd operation or only if the source
+ thread is an MTA thread
+
*/
void DragSource::StartDragImpl(
-const DragGestureEvent& trigger,
-sal_Int8 sourceActions,
-sal_Int32 /*cursor*/,
-sal_Int32 /*image*/,
-const Reference& trans,
-const Reference& listener )
+ const DragGestureEvent& trigger,
+ sal_Int8 sourceActions,
+ sal_Int32 /*cursor*/,
+ sal_Int32 /*image*/,
+ const Reference& trans,
+ const Reference& listener )
{
-// The actions supported by the drag source
+ // The actions supported by the drag source
m_sourceActions= sourceActions;
// We need to know which mouse button triggered the operation.
// If it was the left one, then the drop occurs when that button
@@ -132,26 +132,26 @@ void DragSource::StartDragImpl(
g_XTransferable = trans;
//<-- TRA
-m_spDataObject= m_aDataConverter.createDataObjFromTransferable(
+ m_spDataObject= m_aDataConverter.createDataObjFromTransferable(
m_serviceFactory, trans);
// Obtain the id of the thread that created the window
DWORD processId;
m_threadIdWindow= GetWindowThreadProcessId( m_hAppWindow, );
-// hold the instance for the DnD thread, it's to late
-// to acquire at the start of the thread procedure
-// the thread procedure is responsible for the release
-acquire();
+ // hold the instance for the DnD thread, it's to late
+ // to acquire at the start of the thread procedure
+ // the thread procedure is responsible for the release
+ acquire();
- // The thread acccesses members of this instance but does not call
acquire.
+ // The thread accesses members of this instance but does not call
acquire.
// Hopefully this instance is not destroyed before the thread has
terminated.
unsigned threadId;
HANDLE hThread= reinterpret_cast(_beginthreadex(
-0, 0, DndOleSTAFunc, reinterpret_cast(this), 0, ));
+ 0, 0, DndOleSTAFunc, reinterpret_cast(this), 0,
));
-// detach from thread
-CloseHandle(hThread);
+ // detach from thread
+ CloseHandle(hThread);
}
//
[openoffice] branch trunk updated: silence uninitialized warning
This is an automated email from the ASF dual-hosted git repository. jim pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 6ffb02e silence uninitialized warning 6ffb02e is described below commit 6ffb02e9df8c0b1dc427d1722230d21c8ebc14ed Author: Jim Jagielski AuthorDate: Fri Dec 4 09:28:45 2020 -0500 silence uninitialized warning (cherry picked from commit f4cb3a436aec3679c54f9569ae436eb162fcfac8) --- main/automation/source/simplecm/packethandler.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/automation/source/simplecm/packethandler.cxx b/main/automation/source/simplecm/packethandler.cxx index 6de9dd5..ab0a335 100644 --- a/main/automation/source/simplecm/packethandler.cxx +++ b/main/automation/source/simplecm/packethandler.cxx @@ -115,7 +115,7 @@ comm_BOOL PacketHandler::ReceiveData( void* , comm_UINT32 ) bWasError |= nLenCheck != CalcCheckByte( nBytes ); - comm_UINT16 nHeaderBytes; + comm_UINT16 nHeaderBytes = 0; READ_SOCKET_LEN( , 2, nReadSoFar ); nHeaderBytes = NETWORD( nHeaderBytes ); // reicht der Header �ber das Ende hinaus?
[openoffice] branch AOO42X updated: silence uninitialized warning
This is an automated email from the ASF dual-hosted git repository. jim pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new f4cb3a4 silence uninitialized warning f4cb3a4 is described below commit f4cb3a436aec3679c54f9569ae436eb162fcfac8 Author: Jim Jagielski AuthorDate: Fri Dec 4 09:28:45 2020 -0500 silence uninitialized warning --- main/automation/source/simplecm/packethandler.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/automation/source/simplecm/packethandler.cxx b/main/automation/source/simplecm/packethandler.cxx index 6de9dd5..ab0a335 100644 --- a/main/automation/source/simplecm/packethandler.cxx +++ b/main/automation/source/simplecm/packethandler.cxx @@ -115,7 +115,7 @@ comm_BOOL PacketHandler::ReceiveData( void* , comm_UINT32 ) bWasError |= nLenCheck != CalcCheckByte( nBytes ); - comm_UINT16 nHeaderBytes; + comm_UINT16 nHeaderBytes = 0; READ_SOCKET_LEN( , 2, nReadSoFar ); nHeaderBytes = NETWORD( nHeaderBytes ); // reicht der Header �ber das Ende hinaus?
[openoffice] branch trunk updated: Allow user to specify specific macOS SDK to use (an interesting note: Firefox baselines 10.11 for their CI)
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6c994c9 Allow user to specify specific macOS SDK to use (an
interesting note: Firefox baselines 10.11 for their CI)
6c994c9 is described below
commit 6c994c9dd9c662add766d8f4b37491bda989c155
Author: Jim Jagielski
AuthorDate: Fri Dec 4 07:26:36 2020 -0500
Allow user to specify specific macOS SDK to use
(an interesting note: Firefox baselines 10.11 for their CI)
(cherry picked from commit a835cb2e386eac81959111e98cfd90ace4427cca)
---
main/configure.ac | 48
1 file changed, 32 insertions(+), 16 deletions(-)
diff --git a/main/configure.ac b/main/configure.ac
index 32e8cfd..ac50bf6 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -933,6 +933,12 @@ AC_ARG_WITH(macosx-target,
Usage: --with-macosx-target=10.7
],with_macosx_target=$withval,with_macosx_target=10.7)
+AC_ARG_WITH(macosx-sdk,
+[ --macosx-sdkThe macOS SDK to build against
+
+ Usage: --with-macosx-sdk=10.11
+ (or full path:
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk)
+],with_macosx_sdk=$withval,)
AC_ARG_WITH(rat-scan,
[ --with-rat-scan Scan source code for license headers.
Use as --with-rat-scan to automatically download
pre-built Rat binaries.
@@ -1152,7 +1158,7 @@ case "$build_os" in
CC="`xcrun -f clang` -arch x86_64"
fi
if test ! -n "$CXX"; then
- CXX="`xcrun -f clang++` -stdlib=libc++ -arch x86_64"
+ CXX="`xcrun -f clang++` -arch x86_64"
fi
# Don't use OSVERSION until we know no conflicts result from it
_darwin_version="`uname -r | $AWK -F . '{ print $1 }'`"
@@ -3875,7 +3881,7 @@ AC_SUBST(LIBXML_LIBS)
dnl ===
-dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment
target
+dnl Checks for a MacOS platform SDK compatible with deployment target
dnl ===
if test "$_os" = "Darwin"; then
sdk_target=$with_macosx_target
@@ -3887,21 +3893,31 @@ if test "$_os" = "Darwin"; then
AC_MSG_ERROR([SDK version < 10.7 is not longer supported])
else
MACOSX_DEPLOYMENT_TARGET=$sdk_target
-
- dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
- dnl First look for macOS10.x SDKs (Up thru Xcode 12.1)
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk
macosx10.(7|8|10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1`
- dnl If not found, look for macOS11.x SDKs (Xcode 12.2 and later)
- if test -z "$sdk_found"; then
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0)" | sed -e
"s/.*sdk //" | tail -n1`
- fi
- if test -z "$sdk_found"; then
- AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
- else
- AC_MSG_RESULT([yes, by using SDK $sdk_found])
+ sdk_path=$with_macosx_sdk
+ if test -z "$sdk_path"; then
+ dnl --macosx-sdk not used (or blank): We look for the SDK
+ dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
+ dnl First look for macOS10.x SDKs (Up thru Xcode 12.1)
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk
macosx10.(7|8|10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1`
+ dnl If not found, look for macOS11.x SDKs (Xcode 12.2 and later)
+ if test -z "$sdk_found"; then
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0)" | sed
-e "s/.*sdk //" | tail -n1`
+ fi
+ if test -z "$sdk_found"; then
+ AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
+ else
+ AC_MSG_RESULT([yes, by using SDK $sdk_found])
+ fi
+ sdk_path=`xcodebuild -version -sdk ${sdk_found} Path`
+ elif test ! -d "$sdk_path"; then
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx${sdk_path}" |
sed -e "s/.*sdk //" | tail -n1`
+ if test -z "$sdk_found"; then
+ AC_MSG_ERROR([SDK macosx${sdk_path} not found by xcodebuild])
+ else
+ AC_MSG_RESULT([SDK $sdk_found])
+ fi
+ sdk_path=`xcodebuild -version -sdk ${sdk_found} Path`
fi
-
- sdk_path=`xcodebuild -version -sdk ${sdk_found} Path`
AC_MSG_CHECKING([for $sdk_path])
if test -d "$sdk_path"; then
AC_MSG_RESULT([yes])
[openoffice] branch AOO42X updated: Allow user to specify specific macOS SDK to use (an interesting note: Firefox baselines 10.11 for their CI)
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new a835cb2 Allow user to specify specific macOS SDK to use (an
interesting note: Firefox baselines 10.11 for their CI)
a835cb2 is described below
commit a835cb2e386eac81959111e98cfd90ace4427cca
Author: Jim Jagielski
AuthorDate: Fri Dec 4 07:26:36 2020 -0500
Allow user to specify specific macOS SDK to use
(an interesting note: Firefox baselines 10.11 for their CI)
---
main/configure.ac | 48
1 file changed, 32 insertions(+), 16 deletions(-)
diff --git a/main/configure.ac b/main/configure.ac
index 32e8cfd..ac50bf6 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -933,6 +933,12 @@ AC_ARG_WITH(macosx-target,
Usage: --with-macosx-target=10.7
],with_macosx_target=$withval,with_macosx_target=10.7)
+AC_ARG_WITH(macosx-sdk,
+[ --macosx-sdkThe macOS SDK to build against
+
+ Usage: --with-macosx-sdk=10.11
+ (or full path:
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk)
+],with_macosx_sdk=$withval,)
AC_ARG_WITH(rat-scan,
[ --with-rat-scan Scan source code for license headers.
Use as --with-rat-scan to automatically download
pre-built Rat binaries.
@@ -1152,7 +1158,7 @@ case "$build_os" in
CC="`xcrun -f clang` -arch x86_64"
fi
if test ! -n "$CXX"; then
- CXX="`xcrun -f clang++` -stdlib=libc++ -arch x86_64"
+ CXX="`xcrun -f clang++` -arch x86_64"
fi
# Don't use OSVERSION until we know no conflicts result from it
_darwin_version="`uname -r | $AWK -F . '{ print $1 }'`"
@@ -3875,7 +3881,7 @@ AC_SUBST(LIBXML_LIBS)
dnl ===
-dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment
target
+dnl Checks for a MacOS platform SDK compatible with deployment target
dnl ===
if test "$_os" = "Darwin"; then
sdk_target=$with_macosx_target
@@ -3887,21 +3893,31 @@ if test "$_os" = "Darwin"; then
AC_MSG_ERROR([SDK version < 10.7 is not longer supported])
else
MACOSX_DEPLOYMENT_TARGET=$sdk_target
-
- dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
- dnl First look for macOS10.x SDKs (Up thru Xcode 12.1)
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk
macosx10.(7|8|10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1`
- dnl If not found, look for macOS11.x SDKs (Xcode 12.2 and later)
- if test -z "$sdk_found"; then
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0)" | sed -e
"s/.*sdk //" | tail -n1`
- fi
- if test -z "$sdk_found"; then
- AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
- else
- AC_MSG_RESULT([yes, by using SDK $sdk_found])
+ sdk_path=$with_macosx_sdk
+ if test -z "$sdk_path"; then
+ dnl --macosx-sdk not used (or blank): We look for the SDK
+ dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
+ dnl First look for macOS10.x SDKs (Up thru Xcode 12.1)
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk
macosx10.(7|8|10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1`
+ dnl If not found, look for macOS11.x SDKs (Xcode 12.2 and later)
+ if test -z "$sdk_found"; then
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0)" | sed
-e "s/.*sdk //" | tail -n1`
+ fi
+ if test -z "$sdk_found"; then
+ AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
+ else
+ AC_MSG_RESULT([yes, by using SDK $sdk_found])
+ fi
+ sdk_path=`xcodebuild -version -sdk ${sdk_found} Path`
+ elif test ! -d "$sdk_path"; then
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx${sdk_path}" |
sed -e "s/.*sdk //" | tail -n1`
+ if test -z "$sdk_found"; then
+ AC_MSG_ERROR([SDK macosx${sdk_path} not found by xcodebuild])
+ else
+ AC_MSG_RESULT([SDK $sdk_found])
+ fi
+ sdk_path=`xcodebuild -version -sdk ${sdk_found} Path`
fi
-
- sdk_path=`xcodebuild -version -sdk ${sdk_found} Path`
AC_MSG_CHECKING([for $sdk_path])
if test -d "$sdk_path"; then
AC_MSG_RESULT([yes])
buildbot success in on openoffice-win7
The Buildbot has detected a restored build on builder openoffice-win7 while building . Full details are available at: https://ci.apache.org/builders/openoffice-win7/builds/472 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-win10 Build Reason: The Nightly scheduler named 'openoffice-win7-nightly' triggered this build Build Source Stamp: [branch trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
