You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2022/07/31 07:47:02 UTC

[openoffice] branch AOO42X updated: Fix for regression in

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 7964979203 Fix for regression in
7964979203 is described below

commit 796497920373ba5d71862eb5b273cbe587075204
Author: mseidel <ms...@apache.org>
AuthorDate: Sun Jul 31 09:35:58 2022 +0200

    Fix for regression in
    
    https://bz.apache.org/ooo/show_bug.cgi?id=19221
    
    Thank you very much, Laurent!
    
    (cherry picked from commit 09edc5ae9fb853902001b332819f1d7f468c4806)
---
 main/basic/source/runtime/stdobj.cxx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/main/basic/source/runtime/stdobj.cxx b/main/basic/source/runtime/stdobj.cxx
index 9d7bcc89d4..ae5a824e6c 100644
--- a/main/basic/source/runtime/stdobj.cxx
+++ b/main/basic/source/runtime/stdobj.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.
- * 
+ *
  *************************************************************/
 
 
@@ -40,8 +40,8 @@
 #define _TYPEMASK   0xF000  // Maske fuer den Typ des Eintrags
 
 #define _READ       0x0100  // kann gelesen werden
-#define _BWRITE     0x0200  // kann as Lvalue verwendet werden
-#define _LVALUE     _BWRITE // kann as Lvalue verwendet werden
+#define _BWRITE     0x0200  // kann als Lvalue verwendet werden
+#define _LVALUE     _BWRITE // kann als Lvalue verwendet werden
 #define _READWRITE  0x0300  // beides
 #define _OPT        0x0400  // Parameter ist optional
 #define	_CONST		0x0800	// Property ist const
@@ -522,6 +522,7 @@ static Methods aMethods[] = {
   { "Expression",   SbxVARIANT, 0,NULL,0 },
   { "Value",        SbxVARIANT, 0,NULL,0 },
 { "Tab",          	SbxSTRING,      1 | _FUNCTION, RTLNAME(Tab),0           },
+  { "Count",        SbxLONG, 0,NULL,0 },
 { "Tan",            SbxDOUBLE,    1 | _FUNCTION, RTLNAME(Tan),0             },
   { "number",       SbxDOUBLE, 0,NULL,0 },
 { "Time",           SbxVARIANT,       _LFUNCTION,RTLNAME(Time),0            },
@@ -723,7 +724,7 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
 	return pVar;
 }
 
-// SetModified mu� bei der RTL abgklemmt werden
+// SetModified muss bei der RTL abgeklemmt werden
 void SbiStdObject::SetModified( sal_Bool )
 {
 }
@@ -769,7 +770,7 @@ void SbiStdObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 }
 
 // Zusammenbau der Infostruktur fuer einzelne Elemente
-// Falls nIdx = 0, nix erzeugen (sind Std-Props!)
+// Falls nIdx = 0, nichts erzeugen (sind Std-Props!)
 
 SbxInfo* SbiStdObject::GetInfo( short nIdx )
 {