[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-distributed-cell-text-svx.diff |   32 ++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 23baf2272ae1a6d581a282b276697172a676fb88
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Oct 4 15:44:52 2010 -0400

    Adjusted patch to apply again.
    
    * patches/dev300/calc-distributed-cell-text-svx.diff

diff --git a/patches/dev300/calc-distributed-cell-text-svx.diff b/patches/dev300/calc-distributed-cell-text-svx.diff
index 97f2a28..0de2dc7 100644
--- a/patches/dev300/calc-distributed-cell-text-svx.diff
+++ b/patches/dev300/calc-distributed-cell-text-svx.diff
@@ -34,8 +34,8 @@ index faf381d..2663c47 100644
 -                                    SfxMapUnit ePresMetric,
 -                                    String &rText, const IntlWrapper * = 0 ) const;
 -
--    virtual	sal_Bool        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
--    virtual	sal_Bool			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 -
 -    virtual USHORT          GetValueCount() const;
 -    virtual String          GetValueText( USHORT nVal ) const;
@@ -69,8 +69,8 @@ index faf381d..2663c47 100644
 -                                    SfxMapUnit ePresMetric,
 -                                    String &rText, const IntlWrapper * = 0 ) const;
 -
--    virtual	sal_Bool        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
--    virtual	sal_Bool			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 -
 -    virtual USHORT          GetValueCount() const;
 -    virtual String          GetValueText( USHORT nVal ) const;
@@ -151,7 +151,7 @@ index ac96e23..a8551cc 100644
  #include <com/sun/star/util/SortField.hpp>
  #include <com/sun/star/util/SortFieldType.hpp>
  #include <com/sun/star/table/CellOrientation.hpp>
-@@ -63,334 +59,9 @@ using namespace ::com::sun::star;
+@@ -63,334 +63,9 @@ using namespace ::com::sun::star;
  // STATIC DATA -----------------------------------------------------------
  
  //TYPEINIT1_AUTOFACTORY( SvxHorJustifyItem, SfxEnumItem );
@@ -199,7 +199,7 @@ index ac96e23..a8551cc 100644
 -
 -//------------------------------------------------------------------------
 -
--sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+-bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 -{
 -//    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
 -    nMemberId &= ~CONVERT_TWIPS;
@@ -240,10 +240,10 @@ index ac96e23..a8551cc 100644
 -            }
 -            break;
 -    }
--    return sal_True;
+-    return true;
 -}
 -
--sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+-bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 -{
 -//    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
 -    nMemberId &= ~CONVERT_TWIPS;
@@ -293,7 +293,7 @@ index ac96e23..a8551cc 100644
 -                SetValue( (USHORT)eSvx );
 -            }
 -    }
--    return sal_True;
+-    return true;
 -}
 -
 -//------------------------------------------------------------------------
@@ -365,7 +365,7 @@ index ac96e23..a8551cc 100644
 -
 -//------------------------------------------------------------------------
 -
--sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+-bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 -{
 -    nMemberId &= ~CONVERT_TWIPS;
 -    switch ( nMemberId )
@@ -398,10 +398,10 @@ index ac96e23..a8551cc 100644
 -                break;
 -            }
 -    }
--    return sal_True;
+-    return true;
 -}
 -
--sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+-bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 -{
 -    nMemberId &= ~CONVERT_TWIPS;
 -    switch ( nMemberId )
@@ -449,7 +449,7 @@ index ac96e23..a8551cc 100644
 -            }
 -    }
 -
--    return sal_True;
+-    return true;
 -}
 -
 -//------------------------------------------------------------------------
@@ -532,7 +532,7 @@ index f15f714..d8e4556 100644
  
 -//	QueryValue/PutValue: Der ::com::sun::star::table::CellVertJustify enum wird mitbenutzt...
 -
- sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+ bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
  {
 -    table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
 +    sal_Int32 nUno = table::CellVertJustify2::STANDARD;
@@ -549,10 +549,10 @@ index f15f714..d8e4556 100644
      }
 -    rVal <<= eUno;
 +    rVal <<= nUno;
-     return sal_True;
+     return true;
  }
  
- sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+ bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
  {
 -    table::CellVertJustify eUno;
 -    if(!(rVal >>= eUno))