[Libreoffice-commits] core.git: 3 commits - autogen.sh boost/boost.6369.warnings.patch editeng/inc editeng/source

[Caolán McNamara]

 autogen.sh                       |    1 +
 boost/boost.6369.warnings.patch  |   21 +++++++++++++++++++++
 editeng/inc/editeng/numitem.hxx  |    1 +
 editeng/source/items/numitem.cxx |   17 +++++++++++++++++
 4 files changed, 40 insertions(+)

New commits:
commit fe82b2237baa7f64fc53e8c864535a28264baa6e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Apr 21 21:30:35 2013 +0100

    some more warnings in parts of boost we will use soon
    
    Change-Id: Ie7a16402ab577ccae7688284712ed2657b509f76

diff --git a/boost/boost.6369.warnings.patch b/boost/boost.6369.warnings.patch
index 2cc1ebd..5a7e336 100644
--- a/boost/boost.6369.warnings.patch
+++ b/boost/boost.6369.warnings.patch
@@ -320,4 +320,25 @@
 +                    rule_info(std::string(name_to_register), trace_node_))
                  ).second;
              }
+
+--- misc/boost_1_44_0/boost/variant/variant.hpp	2012-01-08 20:16:41.321760852 +0000
++++ misc/build/boost_1_44_0/boost/variant/variant.hpp	2012-01-08 20:25:43.233484675 +0000
+@@ -1143,14 +1143,14 @@
+     which_t which_;
+     storage_t storage_;
  
+-    void indicate_which(int which)
++    void indicate_which(int i_which)
+     {
+-        which_ = static_cast<which_t>( which );
++        which_ = static_cast<which_t>( i_which );
+     }
+ 
+-    void indicate_backup_which(int which)
++    void indicate_backup_which(int i_which)
+     {
+-        which_ = static_cast<which_t>( -(which + 1) );
++        which_ = static_cast<which_t>( -(i_which + 1) );
+     }
+ 
+ private: // helpers, for queries (below)
commit 1cb1db442e46616b1de121141cd94c114d4fce52
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Apr 21 13:50:12 2013 +0100

    restore SvxNumRule::SetLevel variant
    
    correctly removed as unused by 1dc612970f57aa5599c6d1b7afb10a3f5f4403d2 but we
    will need it again
    
    Change-Id: I2d5c391506a84abe435547232398aa43a3468fe6

diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index f17e9cf..9f88e79 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -267,6 +267,7 @@ public:
     const SvxNumberFormat*  Get(sal_uInt16 nLevel)const;
     const SvxNumberFormat&  GetLevel(sal_uInt16 nLevel)const;
     void                    SetLevel(sal_uInt16 nLevel, const SvxNumberFormat& rFmt, sal_Bool bIsValid = sal_True);
+    void                    SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt);
 
     sal_Bool                    IsContinuousNumbering()const
                                             {return bContinuousNumbering;}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 7ef42e0..973dd63 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -836,6 +836,23 @@ void SvxNumRule::SetLevel( sal_uInt16 i, const SvxNumberFormat& rNumFmt, sal_Boo
     }
 }
 
+void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
+{
+    DBG_ASSERT(nLevel < SVX_MAX_NUM, "Wrong Level" );
+
+    if( nLevel < SVX_MAX_NUM )
+    {
+        aFmtsSet[nLevel] = 0 != pFmt;
+        if(pFmt)
+            SetLevel(nLevel, *pFmt);
+        else
+        {
+            delete aFmts[nLevel];
+            aFmts[nLevel] = 0;
+        }
+    }
+}
+
 String  SvxNumRule::MakeNumString( const SvxNodeNum& rNum, sal_Bool bInclStrings ) const
 {
     String aStr;
commit 53e6c475939df22c849d410efc2aa9bfd28ad819
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 22 10:23:49 2013 +0100

    aix stuffs stuff into /opt/freeware/share in defacto default
    
    Change-Id: I2cd8e3498f81b96041c81cdc48ca6277ccbb210d

diff --git a/autogen.sh b/autogen.sh
index 2498c5a..0e61ee5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -162,6 +162,7 @@ my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
 
 $aclocal_flags .= " -I $src_path/m4";
 $aclocal_flags .= " -I $src_path/m4/mac" if ($system eq 'Darwin');
+$aclocal_flags .= " -I /opt/freeware/share/aclocal" if ($system eq 'AIX');
 
 $ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin'));