[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - solenv/inc svl/inc svl/source vcl/inc

[Herbert Dürr]

 solenv/inc/lldb4aoo.py         |   17 +++++++++++++++++
 svl/inc/svl/zformat.hxx        |    4 ++--
 svl/source/numbers/zformat.cxx |    4 ++--
 vcl/inc/win/g_msaasvc.h        |   33 ++++++++++++++++++---------------
 4 files changed, 39 insertions(+), 19 deletions(-)

New commits:
commit 9c2bd795b65a5fa25f29c5773790d7281c227f4c
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Nov 18 09:42:46 2013 +0000

    #i123693# WaE: const type qualifier ignored on return value
    
    this fix removes almost 120 compile warnings during the AOO build

diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 1f0becd..cae9f54 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -160,7 +160,7 @@ public:
     const SvNumberNatNum& GetNatNum() const { return aNatNum; }
 
     // check, if the format code contains a subformat for text
-    const bool HasTextFormatCode() const;
+    bool HasTextFormatCode() const;
 
 private:
     ImpSvNumberformatInfo aI;           // Hilfsstruct fuer die restlichen Infos
@@ -336,7 +336,7 @@ public:
     sal_Bool HasNewCurrency() const;
 
     // check, if the format code contains a subformat for text
-    const bool HasTextFormatCode() const;
+    bool HasTextFormatCode() const;
 
     // Build string from NewCurrency for saving it SO50 compatible
     void Build50Formatstring( String& rStr ) const;
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index e8df25e..c5db134 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -406,7 +406,7 @@ sal_Bool ImpSvNumFor::HasNewCurrency() const
     return sal_False;
 }
 
-const bool ImpSvNumFor::HasTextFormatCode() const
+bool ImpSvNumFor::HasTextFormatCode() const
 {
     return aI.eScannedType == NUMBERFORMAT_TEXT;
 }
@@ -1722,7 +1722,7 @@ sal_Bool SvNumberformat::HasNewCurrency() const
     return sal_False;
 }
 
-const bool SvNumberformat::HasTextFormatCode() const
+bool SvNumberformat::HasTextFormatCode() const
 {
     for ( sal_uInt16 j=0; j<4; j++ )
     {
commit f1390100e005cece4fdc93a7c760c79929153a4d
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Nov 18 08:32:52 2013 +0000

    #i107914# adjust the g_msaasvc.h license header to the ALv2
    
    as intended by IBM's contribution of the Symphony source code
    and the individual ICLAs of the developers

diff --git a/vcl/inc/win/g_msaasvc.h b/vcl/inc/win/g_msaasvc.h
index e612fa3..2aa79e7 100644
--- a/vcl/inc/win/g_msaasvc.h
+++ b/vcl/inc/win/g_msaasvc.h
@@ -1,23 +1,26 @@
-/************************************************************************
+/**************************************************************
  *
- * Licensed Materials - Property of IBM.
- * (C) Copyright IBM Corporation 2003, 2009.  All Rights Reserved.
- * U.S. Government Users Restricted Rights:
- * Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
- *
- ************************************************************************/
-
-/*************************************************************************
+ * 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
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
  *
- * (C) Copyright IBM Corp. 2003, 2005
- * The source code for this program is not published or otherwise
- * divested of its IBM trade secrets, irrespective of what has
- * been deposited with the U.S. Copyright Office.
- * All rights reserved
+ * 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.
  *
-*************************************************************************/
+ *************************************************************/
+
 #ifndef _SV_G_MSASSVR_H_
 #define _SV_G_MSASSVR_H_
 extern com::sun::star::accessibility::XMSAAService* g_acc_manager1;
 #endif
+
commit a49de20398b27aba210e8f4b3a0bd7207853b90b
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Nov 18 08:31:11 2013 +0000

    #i107914# revert license header change which was introduced as svn-merge artifact

diff --git a/solenv/inc/lldb4aoo.py b/solenv/inc/lldb4aoo.py
index 3f64058..a9bc3fc 100644
--- a/solenv/inc/lldb4aoo.py
+++ b/solenv/inc/lldb4aoo.py
@@ -1,3 +1,20 @@
+# 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
+# regarding copyright ownership.  The ASF licenses this file
+# 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.
+
 # to activate the AOO-LLDB helper script type the line below into LLDB
 #	command script import path-to-script/lldb4aoo.py
 # or activate it automatically by adding the line to ~/.lldbinit