From ea6f3c09cf76932ce567e8d3250e0f665ca42c99 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 23 Nov 2013 22:40:38 +0100 Subject: [PATCH] outter -> outer (also when "outter" is inside another word) Change-Id: I0290d57f1c27a82a34a7dba56d88d51ec6d0bd9e --- .../org/libreoffice/ui/FolderIconView.java | 18 +++++++------- forms/source/richtext/richtextimplcontrol.hxx | 2 +- lotuswordpro/source/filter/lwpparastyle.cxx | 6 ++--- .../source/filter/xfilter/xfborders.cxx | 24 +++++++++---------- .../source/filter/xfilter/xfborders.hxx | 10 ++++---- lotuswordpro/source/filter/xfilter/xfdefs.hxx | 2 +- .../filter/xfilter/xflinenumberconfig.hxx | 4 ++-- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java index 4f518ed22e8f..5960e5ea4668 100644 --- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java +++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java @@ -68,15 +68,15 @@ public class FolderIconView extends View{ float height = (float)this.getHeight(); float centerX = width*0.5f;// centered on horz axis float centerY = height*0.5f; - float outterRadius = 0.8f*0.5f* width; + float outerRadius = 0.8f*0.5f* width; float innerRadius = 0.7f*0.5f* width; - float thumbHeight = outterRadius*1.25f; + float thumbHeight = outerRadius*1.25f; float thumbWidth = thumbHeight*(float)(1/Math.sqrt(2)); - float DZx = 0.2f*outterRadius; - float DZy = 0.2f*outterRadius; + float DZx = 0.2f*outerRadius; + float DZy = 0.2f*outerRadius; //Bitmap blankPage = BitmapFactory.decodeResource( getResources() , R.drawable.page ); Log.i( TAG , Float.toString( width ) + " X " + Float.toString( height ) ); - canvas.drawCircle( centerX , centerY , outterRadius , mPaintGray ); + canvas.drawCircle( centerX , centerY , outerRadius , mPaintGray ); canvas.drawCircle( centerX , centerY , innerRadius , mPaintBlack ); //Either get thumbs from directory or use generic page images //For now just get the first 4 thumbs -> add some checks later @@ -103,8 +103,8 @@ public class FolderIconView extends View{ // Show a generic blank page icon if( thumbs.isEmpty() ) return; - /*float left = centerX ;//+ 0.25f*outterRadius; - float top = centerY - 0.5f*outterRadius; + /*float left = centerX ;//+ 0.25f*outerRadius; + float top = centerY - 0.5f*outerRadius; float right = left + thumbs.get(0).getWidth()*0.4f; float bottom = top + thumbs.get(0).getHeight()*0.4f; RectF dest = new RectF( left, top , right , bottom ); @@ -114,8 +114,8 @@ public class FolderIconView extends View{ for( int i = 1 ; i <= size ; i++ ){ canvas.drawRect( shadowBox , mPaintShadow); canvas.drawBitmap( thumbs.pop() , null , dest , null); - dest.offset( -outterRadius*0.2f , outterRadius*0.1f ); - shadowBox.offset( -outterRadius*0.2f , outterRadius*0.1f ); + dest.offset( -outerRadius*0.2f , outerRadius*0.1f ); + shadowBox.offset( -outerRadius*0.2f , outerRadius*0.1f ); }*/ float left; float top; diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index c953185b9a2b..f9f5c8788f91 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -104,7 +104,7 @@ namespace frm There are some attributes which are script dependent, e.g. the CharPosture. This means that in real, there are 3 attributes for this, one for every possible script type (latin, asian, complex). However, to the out world, we behave as if there is only one attribute: - E.g., if the outter world asks for the state of the "CharPosture" attribute, we return + E.g., if the outer world asks for the state of the "CharPosture" attribute, we return the state of either CharPostureLatin, CharPostureAsian, or CharPostureComplex, depending on the script type of the current selection. (In real, it may be more complex since the current selection may contain more than one script type.) diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index e00ac2c054ee..5a4ec6707c4e 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -281,21 +281,21 @@ void LwpParaStyle::ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff:: case 0x15: //double , fall through! case 0x16: //thick double pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False); - pXFBorders->SetWidthOutter(eXFBorderSide, static_cast(fWidth*0.333)); + pXFBorders->SetWidthOuter(eXFBorderSide, static_cast(fWidth*0.333)); pXFBorders->SetWidthSpace(eXFBorderSide, static_cast(fWidth*0.334)); pXFBorders->SetWidthInner(eXFBorderSide, static_cast(fWidth*0.333)); // pXFBorders->SetWidth(eXFBorderSide, fWidth); break; case 0x18: //thick-thin pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False); - pXFBorders->SetWidthOutter(eXFBorderSide, static_cast(fWidth*0.5)); + pXFBorders->SetWidthOuter(eXFBorderSide, static_cast(fWidth*0.5)); pXFBorders->SetWidthInner(eXFBorderSide, static_cast(fWidth*0.25)); pXFBorders->SetWidthSpace(eXFBorderSide, static_cast(fWidth*0.25)); break; case 0x19: //thin-thick pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False); pXFBorders->SetWidthInner(eXFBorderSide, static_cast(fWidth*0.7)); - pXFBorders->SetWidthOutter(eXFBorderSide, static_cast(fWidth*0.15)); + pXFBorders->SetWidthOuter(eXFBorderSide, static_cast(fWidth*0.15)); pXFBorders->SetWidthSpace(eXFBorderSide, static_cast(fWidth*0.15)); break; } diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx index 89a3fcb07836..228cbbb0f62a 100644 --- a/lotuswordpro/source/filter/xfilter/xfborders.cxx +++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx @@ -66,7 +66,7 @@ XFBorder::XFBorder() m_bSameWidth = sal_False; m_fWidthInner = 0; m_fWidthSpace = 0; - m_fWidthOutter = 0; + m_fWidthOuter = 0; } void XFBorder::SetColor(XFColor& color) @@ -84,7 +84,7 @@ void XFBorder::SetWidth(double width) else if( m_bDouble && m_bSameWidth ) { m_fWidthInner = width; - m_fWidthOutter = width; + m_fWidthOuter = width; m_fWidthSpace = width; } } @@ -107,10 +107,10 @@ void XFBorder::SetWidthSpace(double space) m_fWidthSpace = space; } -void XFBorder::SetWidthOutter(double outer) +void XFBorder::SetWidthOuter(double outer) { assert(m_bDouble); - m_fWidthOutter = outer; + m_fWidthOuter = outer; } OUString XFBorder::GetLineWidth() @@ -121,7 +121,7 @@ OUString XFBorder::GetLineWidth() { str = FloatToOUString(m_fWidthInner); str += A2OUSTR("cm ") + DoubleToOUString(m_fWidthSpace); - str += A2OUSTR("cm ") + DoubleToOUString(m_fWidthOutter) + A2OUSTR("cm"); + str += A2OUSTR("cm ") + DoubleToOUString(m_fWidthOuter) + A2OUSTR("cm"); } return str; } @@ -132,7 +132,7 @@ OUString XFBorder::ToString() if( m_bDouble ) { - double width = m_fWidthInner + m_fWidthSpace + m_fWidthOutter; + double width = m_fWidthInner + m_fWidthSpace + m_fWidthOuter; if( widthAddAttribute( A2OUSTR("text:number-position"), A2OUSTR("right") ); else if( m_ePosition == enumXFLineNumberInner ) pAttrList->AddAttribute( A2OUSTR("text:number-position"), A2OUSTR("inner") ); - else if( m_ePosition == enumXFLineNumberOutter ) - pAttrList->AddAttribute( A2OUSTR("text:number-position"), A2OUSTR("outter") ); + else if( m_ePosition == enumXFLineNumberOuter ) + pAttrList->AddAttribute( A2OUSTR("text:number-position"), A2OUSTR("outer") ); pAttrList->AddAttribute( A2OUSTR("text:increment"), Int32ToOUString(m_nIncrement) );