ooo-build r11642 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: Wed Feb 20 12:48:05 2008
New Revision: 11642
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11642&view=rev

Log:
2008-02-20  Tor Lillqvist  <tml novell com>

	* patches/src680/cjk-character-units-imp.diff
	* patches/src680/cws-cjksp1-sw.diff: Remove stray CRs.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/cjk-character-units-imp.diff
   trunk/patches/src680/cws-cjksp1-sw.diff

Modified: trunk/patches/src680/cjk-character-units-imp.diff
==============================================================================
--- trunk/patches/src680/cjk-character-units-imp.diff	(original)
+++ trunk/patches/src680/cjk-character-units-imp.diff	Wed Feb 20 12:48:05 2008
@@ -462,7 +462,7 @@
  /* -----------------------------08.02.2002 10:54------------------------------
  
 @@ -450,6 +456,10 @@
-             long nHeight = static_cast< sal_Int32 >(m_aPageSize.Height() / aLinesPerPageNF.GetValue());
+             long nHeight = static_cast< sal_Int32 >(m_aPageSize.Height() / aLinesPerPageNF.GetValue());
              aTextSizeMF.SetValue(aTextSizeMF.Normalize(nHeight), FUNIT_TWIP);
              aRubySizeMF.SetValue(0, FUNIT_TWIP);
 +            String aMaxLinesFTStr = String::CreateFromAscii("( 1 - ");
@@ -474,7 +474,7 @@
              m_bRubyUserValue = sal_True;
 @@ -458,6 +468,10 @@
          {
-             long nWidth = static_cast< sal_Int32 >(m_aPageSize.Width() / aCharsPerLineNF.GetValue());
+             long nWidth = static_cast< sal_Int32 >(m_aPageSize.Width() / aCharsPerLineNF.GetValue());
              aCharWidthMF.SetValue(aCharWidthMF.Normalize(nWidth), FUNIT_TWIP);
 +            String aMaxCharsFTStr = String::CreateFromAscii("( 1 - ");
 +            aMaxCharsFTStr += String::CreateFromInt32(aCharsPerLineNF.GetValue());
@@ -492,7 +492,7 @@
      }
  		//set maximum line per page
 @@ -491,14 +504,22 @@
-             sal_Int32 nTextSize = static_cast< sal_Int32 >(aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)));
+             sal_Int32 nTextSize = static_cast< sal_Int32 >(aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)));
              aLinesPerPageNF.SetValue(m_aPageSize.Height() / nTextSize);
              m_bRubyUserValue = sal_False;
 +            String aRangesStr = String::CreateFromAscii("( 1 - ");
@@ -502,7 +502,7 @@
          }
          else if (&aCharWidthMF == pField)
          {
-             sal_Int32 nTextWidth = static_cast< sal_Int32 >(aCharWidthMF.Denormalize(aCharWidthMF.GetValue(FUNIT_TWIP)));
+             sal_Int32 nTextWidth = static_cast< sal_Int32 >(aCharWidthMF.Denormalize(aCharWidthMF.GetValue(FUNIT_TWIP)));
 +            sal_Int32 nMaxChar = 45 ;
              if (nTextWidth)
 -                aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextWidth); 

Modified: trunk/patches/src680/cws-cjksp1-sw.diff
==============================================================================
--- trunk/patches/src680/cws-cjksp1-sw.diff	(original)
+++ trunk/patches/src680/cws-cjksp1-sw.diff	Wed Feb 20 12:48:05 2008
@@ -109,7 +109,7 @@
 +
 +void SwDoc::SetDefaultPageMode(bool bSquaredPageMode)
 +{
-+    if( !bSquaredPageMode == !IsSquaredPageMode() )
++    if( !bSquaredPageMode == !IsSquaredPageMode() )
 +		return;
 +
 +	const SwTextGridItem& rGrid =
@@ -509,7 +509,7 @@
 +    SfxStyleSheetBase* pStyle = pBasePool->Find( aString, (SfxStyleFamily)SFX_STYLE_FAMILY_PARA );
 +    SfxItemSet& aTmpSet = pStyle->GetItemSet();
 +    SvxFontHeightItem &aDefaultFontItem = (SvxFontHeightItem&)aTmpSet.Get(RES_CHRATR_CJK_FONTSIZE); 
-+    return (USHORT)aDefaultFontItem.GetHeight();
++    return (USHORT)aDefaultFontItem.GetHeight();
 +}
  
  #ifdef _RVP_MARK_HXX
@@ -571,7 +571,7 @@
 +                rInf.GetFrm()->SwitchHorizontalToVertical( aPos );
 +            if ( rInf.GetSpace() || rInf.GetKanaComp())
 +            {
-+                long nSpaceAdd = rInf.GetSpace() / SPACING_PRECISION_FACTOR;
++                long nSpaceAdd = rInf.GetSpace() / SPACING_PRECISION_FACTOR;
 +                sal_Bool bSpecialJust = sal_False;
 +                if ( rInf.GetFont() && rInf.GetLen() )
 +                {
@@ -1511,7 +1511,7 @@
      }
 +        else
 +        {
-+            sal_Int32 nTextWidth = static_cast< sal_Int32 >(aCharWidthMF.Denormalize(aCharWidthMF.GetValue(FUNIT_TWIP)));
++            sal_Int32 nTextWidth = static_cast< sal_Int32 >(aCharWidthMF.Denormalize(aCharWidthMF.GetValue(FUNIT_TWIP)));
 +            aLinesPerPageNF.SetValue(m_aPageSize.Height() / nTextSize);
 +            if (nTextWidth)
 +                aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextWidth); 
@@ -1535,7 +1535,7 @@
      if(&aCharsPerLineNF == pField)
      {
 -        long nWidth = m_aPageSize.Width() / static_cast< long >(aCharsPerLineNF.GetValue());
-+            long nWidth = (long)(m_aPageSize.Width() / aCharsPerLineNF.GetValue());
++            long nWidth = (long)(m_aPageSize.Width() / aCharsPerLineNF.GetValue());
          aTextSizeMF.SetValue(aTextSizeMF.Normalize(nWidth), FUNIT_TWIP);
          //prevent rounding errors in the MetricField by saving the used value
          m_nRubyUserValue = nWidth;
@@ -1545,9 +1545,9 @@
 -    else
 +		//set maximum line per page
 +        {
-+            sal_Int32 nMaxLines = static_cast< sal_Int32 >(m_aPageSize.Height() /
++            sal_Int32 nMaxLines = static_cast< sal_Int32 >(m_aPageSize.Height() /
 +                (   aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)) +
-+                    aRubySizeMF.Denormalize(aRubySizeMF.GetValue(FUNIT_TWIP))));
++                    aRubySizeMF.Denormalize(aRubySizeMF.GetValue(FUNIT_TWIP))));
 +            aLinesPerPageNF.SetMax(nMaxLines);
 +        }
 +	}
@@ -1555,7 +1555,7 @@
 +    {
 +        if(&aLinesPerPageNF == pField)
 +        {
-+            long nHeight = static_cast< sal_Int32 >(m_aPageSize.Height() / aLinesPerPageNF.GetValue());
++            long nHeight = static_cast< sal_Int32 >(m_aPageSize.Height() / aLinesPerPageNF.GetValue());
 +            aTextSizeMF.SetValue(aTextSizeMF.Normalize(nHeight), FUNIT_TWIP);
 +            aRubySizeMF.SetValue(0, FUNIT_TWIP);
 +            
@@ -1564,7 +1564,7 @@
 +        }
 +        else if (&aCharsPerLineNF == pField)
 +        {
-+            long nWidth = static_cast< sal_Int32 >(m_aPageSize.Width() / aCharsPerLineNF.GetValue());
++            long nWidth = static_cast< sal_Int32 >(m_aPageSize.Width() / aCharsPerLineNF.GetValue());
 +            aCharWidthMF.SetValue(aCharWidthMF.Normalize(nWidth), FUNIT_TWIP);
 +        }
 +    }
@@ -1586,9 +1586,9 @@
      }
 +		//set maximum line per page
 +        {
-+            sal_Int32 nMaxLines = static_cast< sal_Int32 >(m_aPageSize.Height() /
++            sal_Int32 nMaxLines = static_cast< sal_Int32 >(m_aPageSize.Height() /
 +                (   aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)) +
-+                    aRubySizeMF.Denormalize(aRubySizeMF.GetValue(FUNIT_TWIP))));
++                    aRubySizeMF.Denormalize(aRubySizeMF.GetValue(FUNIT_TWIP))));
 +            aLinesPerPageNF.SetMax(nMaxLines);
 +        }
 +    }
@@ -1596,13 +1596,13 @@
 +    {
 +        if (&aTextSizeMF == pField)
 +        {
-+            sal_Int32 nTextSize = static_cast< sal_Int32 >(aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)));
++            sal_Int32 nTextSize = static_cast< sal_Int32 >(aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)));
 +            aLinesPerPageNF.SetValue(m_aPageSize.Height() / nTextSize);
 +            m_bRubyUserValue = sal_False;
 +        }
 +        else if (&aCharWidthMF == pField)
 +        {
-+            sal_Int32 nTextWidth = static_cast< sal_Int32 >(aCharWidthMF.Denormalize(aCharWidthMF.GetValue(FUNIT_TWIP)));
++            sal_Int32 nTextWidth = static_cast< sal_Int32 >(aCharWidthMF.Denormalize(aCharWidthMF.GetValue(FUNIT_TWIP)));
 +            if (nTextWidth)
 +                aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextWidth); 
 +            else