svn commit: r1718196 - in /openoffice/trunk/main: formula/inc/formula/ formula/source/core/resource/ sc/inc/ sc/source/core/inc/ sc/source/core/tool/ sc/source/ui/src/ sc/util/
Author: damjan
Date: Sun Dec 6 18:17:33 2015
New Revision: 1718196
URL: http://svn.apache.org/viewvc?rev=1718196=rev
Log:
#i126701# Patch for adding bit shift functions to calc
Patch by: Pathangi Janardhanan Jatinshravan
Review by: me
Modified:
openoffice/trunk/main/formula/inc/formula/compiler.hrc
openoffice/trunk/main/formula/inc/formula/opcode.hxx
openoffice/trunk/main/formula/source/core/resource/core_resource.src
openoffice/trunk/main/sc/inc/helpids.h
openoffice/trunk/main/sc/source/core/inc/interpre.hxx
openoffice/trunk/main/sc/source/core/tool/interpr1.cxx
openoffice/trunk/main/sc/source/core/tool/interpr4.cxx
openoffice/trunk/main/sc/source/ui/src/scfuncs.src
openoffice/trunk/main/sc/util/hidother.src
Modified: openoffice/trunk/main/formula/inc/formula/compiler.hrc
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/inc/formula/compiler.hrc?rev=1718196=1718195=1718196=diff
==
--- openoffice/trunk/main/formula/inc/formula/compiler.hrc (original)
+++ openoffice/trunk/main/formula/inc/formula/compiler.hrc Sun Dec 6 18:17:33
2015
@@ -400,10 +400,12 @@
#define SC_OPCODE_BITAND404
#define SC_OPCODE_BITOR 405
#define SC_OPCODE_BITXOR406
+#define SC_OPCODE_BITLSHIFT 407
+#define SC_OPCODE_BITRSHIFT 408
-#define SC_OPCODE_STOP_2_PAR407
+#define SC_OPCODE_STOP_2_PAR409
-#define SC_OPCODE_LAST_OPCODE_ID406 /* last OpCode */
+#define SC_OPCODE_LAST_OPCODE_ID408 /* last OpCode */
/*** Interna ***/
#define SC_OPCODE_INTERNAL_BEGIN
Modified: openoffice/trunk/main/formula/inc/formula/opcode.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/inc/formula/opcode.hxx?rev=1718196=1718195=1718196=diff
==
--- openoffice/trunk/main/formula/inc/formula/opcode.hxx (original)
+++ openoffice/trunk/main/formula/inc/formula/opcode.hxx Sun Dec 6 18:17:33
2015
@@ -397,6 +397,8 @@ enum OpCodeEnum
ocBitAnd= SC_OPCODE_BITAND,
ocBitOr = SC_OPCODE_BITOR,
ocBitXor= SC_OPCODE_BITXOR,
+ ocBitLShift = SC_OPCODE_BITLSHIFT,
+ ocBitRShift = SC_OPCODE_BITRSHIFT,
// internal stuff
ocInternalBegin = SC_OPCODE_INTERNAL_BEGIN,
ocTTT = SC_OPCODE_TTT,
Modified: openoffice/trunk/main/formula/source/core/resource/core_resource.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/source/core/resource/core_resource.src?rev=1718196=1718195=1718196=diff
==
--- openoffice/trunk/main/formula/source/core/resource/core_resource.src
(original)
+++ openoffice/trunk/main/formula/source/core/resource/core_resource.src Sun
Dec 6 18:17:33 2015
@@ -352,6 +352,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGL
String SC_OPCODE_BITAND { Text= "BITAND" ; };
String SC_OPCODE_BITOR { Text= "BITOR" ; };
String SC_OPCODE_BITXOR { Text= "BITXOR" ; };
+String SC_OPCODE_BITLSHIFT { Text= "BITLSHIFT" ; };
+String SC_OPCODE_BITRSHIFT { Text= "BITRSHIFT" ; };
/* BEGIN defined ERROR.TYPE() values. */
String SC_OPCODE_ERROR_NULL{ Text = "#NULL!" ; };
@@ -692,6 +694,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGL
String SC_OPCODE_BITAND { Text = "BITAND" ; };
String SC_OPCODE_BITOR { Text = "BITOR" ; };
String SC_OPCODE_BITXOR { Text = "BITXOR" ; };
+String SC_OPCODE_BITLSHIFT { Text= "BITLSHIFT" ; };
+String SC_OPCODE_BITRSHIFT { Text= "BITRSHIFT" ; };
/* BEGIN defined ERROR.TYPE() values. */
String SC_OPCODE_ERROR_NULL{ Text = "#NULL!" ; };
@@ -1928,6 +1932,14 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "BITXOR";
};
+String SC_OPCODE_BITLSHIFT
+{
+ Text [ en-US ] = "BITLSHIFT";
+};
+String SC_OPCODE_BITRSHIFT
+{
+ Text [ en-US ] = "BITRSHIFT";
+};
/* BEGIN defined ERROR.TYPE() values. */
/* ERROR.TYPE( #NULL! ) == 1 */
String SC_OPCODE_ERROR_NULL
Modified: openoffice/trunk/main/sc/inc/helpids.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/helpids.h?rev=1718196=1718195=1718196=diff
==
--- openoffice/trunk/main/sc/inc/helpids.h (original)
+++ openoffice/trunk/main/sc/inc/helpids.h Sun Dec 6 18:17:33 2015
@@ -777,3 +777,5 @@
#define HID_FUNC_BITAND
"SC_HID_FUNC_BITAND"
#define HID_FUNC_BITOR
"SC_HID_FUNC_BITOR"
#define HID_FUNC_BITXOR
buildbot success in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a passing build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/163 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-fbsd-nightly
The Buildbot has detected a passing build on builder openoffice-fbsd-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/154 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-fbsd2_64bit Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-linux64-rat
The Buildbot has detected a passing build on builder openoffice-linux64-rat while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat/builds/152 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in ASF Buildbot on openoffice-linux64-rat-aoo410
The Buildbot has detected a failed build on builder openoffice-linux64-rat-aoo410 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat-aoo410/builds/148 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat-aoo410' triggered this build Build Source Stamp: [branch openoffice/branches/AOO410] HEAD Blamelist: BUILD FAILED: failed Sincerely, -The Buildbot
svn commit: r1718204 - /openoffice/trunk/main/sdext/source/pdfimport/pdfparse/pdfentries.cxx
Author: pfg
Date: Sun Dec 6 18:56:29 2015
New Revision: 1718204
URL: http://svn.apache.org/viewvc?rev=1718204=rev
Log:
Unnecessary semicolon
Modified:
openoffice/trunk/main/sdext/source/pdfimport/pdfparse/pdfentries.cxx
Modified: openoffice/trunk/main/sdext/source/pdfimport/pdfparse/pdfentries.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/pdfimport/pdfparse/pdfentries.cxx?rev=1718204=1718203=1718204=diff
==
--- openoffice/trunk/main/sdext/source/pdfimport/pdfparse/pdfentries.cxx
(original)
+++ openoffice/trunk/main/sdext/source/pdfimport/pdfparse/pdfentries.cxx Sun
Dec 6 18:56:29 2015
@@ -773,7 +773,7 @@ static void unzipToBuffer( const char* p
if( err == Z_STREAM_END )
{
if( aZStr.avail_out > 0 )
-*pOutLen -= aZStr.avail_out;;
+*pOutLen -= aZStr.avail_out;
}
inflateEnd();
if( err < Z_OK )
buildbot exception in ASF Buildbot on aoo-w7snap
The Buildbot has detected a build exception on builder aoo-w7snap while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-w7snap/builds/17 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-snapshot' triggered this build Build Source Stamp: [branch openoffice/tags/SNAPSHOT] HEAD Blamelist: BUILD FAILED: exception svn info build.pl --all Sincerely, -The Buildbot
buildbot exception in ASF Buildbot on aoo-win7
The Buildbot has detected a build exception on builder aoo-win7 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-win7/builds/102 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: exception svn info build.pl --all Sincerely, -The Buildbot
