mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

outter -> outer (also when "outter" is inside another word)

Browse Source 
Change-Id: I0290d57f1c27a82a34a7dba56d88d51ec6d0bd9e
This commit is contained in:
Julien Nabet
2013-11-23 22:40:38 +01:00
parent 480a0ef7c1
commit ea6f3c09cf
7 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java
View File

@@ -68,15 +68,15 @@ public class FolderIconView extends View{
float height = (float)this.getHeight(); float height = (float)this.getHeight();
float centerX = width*0.5f;// centered on horz axis float centerX = width*0.5f;// centered on horz axis
float centerY = height*0.5f; 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 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 thumbWidth = thumbHeight*(float)(1/Math.sqrt(2));
float DZx = 0.2f*outterRadius; float DZx = 0.2f*outerRadius;
float DZy = 0.2f*outterRadius; float DZy = 0.2f*outerRadius;
//Bitmap blankPage = BitmapFactory.decodeResource( getResources() , R.drawable.page ); //Bitmap blankPage = BitmapFactory.decodeResource( getResources() , R.drawable.page );
Log.i( TAG , Float.toString( width ) + " X " + Float.toString( height ) ); 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 ); canvas.drawCircle( centerX , centerY , innerRadius , mPaintBlack );
//Either get thumbs from directory or use generic page images //Either get thumbs from directory or use generic page images
//For now just get the first 4 thumbs -> add some checks later //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 // Show a generic blank page icon
if( thumbs.isEmpty() ) if( thumbs.isEmpty() )
return; return;
/*float left = centerX ;//+ 0.25f*outterRadius; /*float left = centerX ;//+ 0.25f*outerRadius;
float top = centerY - 0.5f*outterRadius; float top = centerY - 0.5f*outerRadius;
float right = left + thumbs.get(0).getWidth()*0.4f; float right = left + thumbs.get(0).getWidth()*0.4f;
float bottom = top + thumbs.get(0).getHeight()*0.4f; float bottom = top + thumbs.get(0).getHeight()*0.4f;
RectF dest = new RectF( left, top , right , bottom ); RectF dest = new RectF( left, top , right , bottom );
@@ -114,8 +114,8 @@ public class FolderIconView extends View{
for( int i = 1 ; i <= size ; i++ ){ for( int i = 1 ; i <= size ; i++ ){
canvas.drawRect( shadowBox , mPaintShadow); canvas.drawRect( shadowBox , mPaintShadow);
canvas.drawBitmap( thumbs.pop() , null , dest , null); canvas.drawBitmap( thumbs.pop() , null , dest , null);
dest.offset( -outterRadius*0.2f , outterRadius*0.1f ); dest.offset( -outerRadius*0.2f , outerRadius*0.1f );
shadowBox.offset( -outterRadius*0.2f , outterRadius*0.1f ); shadowBox.offset( -outerRadius*0.2f , outerRadius*0.1f );
}*/ }*/
float left; float left;
float top; float top;

2
forms/source/richtext/richtextimplcontrol.hxx
View File

@@ -104,7 +104,7 @@ namespace frm
There are some attributes which are script dependent, e.g. the CharPosture. This means 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, 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: 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 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 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.) the current selection may contain more than one script type.)

6
lotuswordpro/source/filter/lwpparastyle.cxx
View File

@@ -281,21 +281,21 @@ void LwpParaStyle::ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff::
case 0x15: //double , fall through! case 0x15: //double , fall through!
case 0x16: //thick double case 0x16: //thick double
pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False); pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False);
pXFBorders->SetWidthOutter(eXFBorderSide, static_cast<float>(fWidth*0.333)); pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.333));
pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.334)); pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.334));
pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.333)); pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.333));
// pXFBorders->SetWidth(eXFBorderSide, fWidth); // pXFBorders->SetWidth(eXFBorderSide, fWidth);
break; break;
case 0x18: //thick-thin case 0x18: //thick-thin
pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False); pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False);
pXFBorders->SetWidthOutter(eXFBorderSide, static_cast<float>(fWidth*0.5)); pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.5));
pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.25)); pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.25));
pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.25)); pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.25));
break; break;
case 0x19: //thin-thick case 0x19: //thin-thick
pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False); pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False);
pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.7)); pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.7));
pXFBorders->SetWidthOutter(eXFBorderSide, static_cast<float>(fWidth*0.15)); pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.15));
pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.15)); pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.15));
break; break;
} }

24
lotuswordpro/source/filter/xfilter/xfborders.cxx
View File

@@ -66,7 +66,7 @@ XFBorder::XFBorder()
m_bSameWidth = sal_False; m_bSameWidth = sal_False;
m_fWidthInner = 0; m_fWidthInner = 0;
m_fWidthSpace = 0; m_fWidthSpace = 0;
m_fWidthOutter = 0; m_fWidthOuter = 0;
} }
void XFBorder::SetColor(XFColor& color) void XFBorder::SetColor(XFColor& color)
@@ -84,7 +84,7 @@ void XFBorder::SetWidth(double width)
else if( m_bDouble && m_bSameWidth ) else if( m_bDouble && m_bSameWidth )
{ {
m_fWidthInner = width; m_fWidthInner = width;
m_fWidthOutter = width; m_fWidthOuter = width;
m_fWidthSpace = width; m_fWidthSpace = width;
} }
} }
@@ -107,10 +107,10 @@ void XFBorder::SetWidthSpace(double space)
m_fWidthSpace = space; m_fWidthSpace = space;
} }
void XFBorder::SetWidthOutter(double outer) void XFBorder::SetWidthOuter(double outer)
{ {
assert(m_bDouble); assert(m_bDouble);
m_fWidthOutter = outer; m_fWidthOuter = outer;
} }
OUString XFBorder::GetLineWidth() OUString XFBorder::GetLineWidth()
@@ -121,7 +121,7 @@ OUString XFBorder::GetLineWidth()
{ {
str = FloatToOUString(m_fWidthInner); str = FloatToOUString(m_fWidthInner);
str += A2OUSTR("cm ") + DoubleToOUString(m_fWidthSpace); str += A2OUSTR("cm ") + DoubleToOUString(m_fWidthSpace);
str += A2OUSTR("cm ") + DoubleToOUString(m_fWidthOutter) + A2OUSTR("cm"); str += A2OUSTR("cm ") + DoubleToOUString(m_fWidthOuter) + A2OUSTR("cm");
} }
return str; return str;
} }
@@ -132,7 +132,7 @@ OUString XFBorder::ToString()
if( m_bDouble ) if( m_bDouble )
{ {
double width = m_fWidthInner + m_fWidthSpace + m_fWidthOutter; double width = m_fWidthInner + m_fWidthSpace + m_fWidthOuter;
if( width<FLOAT_MIN ) if( width<FLOAT_MIN )
{ {
return str; return str;
@@ -171,7 +171,7 @@ bool operator==(XFBorder& b1, XFBorder& b2)
return true; return true;
if( b1.m_fWidthInner != b2.m_fWidthInner || if( b1.m_fWidthInner != b2.m_fWidthInner ||
b1.m_fWidthSpace != b2.m_fWidthSpace || b1.m_fWidthSpace != b2.m_fWidthSpace ||
b1.m_fWidthOutter != b2.m_fWidthOutter b1.m_fWidthOuter != b2.m_fWidthOuter
) )
return false; return false;
} }
@@ -293,21 +293,21 @@ void XFBorders::SetWidthSpace(enumXFBorder side, double space)
} }
} }
void XFBorders::SetWidthOutter(enumXFBorder side, double outer) void XFBorders::SetWidthOuter(enumXFBorder side, double outer)
{ {
switch(side) switch(side)
{ {
case enumXFBorderLeft: case enumXFBorderLeft:
m_aBorderLeft.SetWidthOutter(outer); m_aBorderLeft.SetWidthOuter(outer);
break; break;
case enumXFBorderRight: case enumXFBorderRight:
m_aBorderRight.SetWidthOutter(outer); m_aBorderRight.SetWidthOuter(outer);
break; break;
case enumXFBorderTop: case enumXFBorderTop:
m_aBorderTop.SetWidthOutter(outer); m_aBorderTop.SetWidthOuter(outer);
break; break;
case enumXFBorderBottom: case enumXFBorderBottom:
m_aBorderBottom.SetWidthOutter(outer); m_aBorderBottom.SetWidthOuter(outer);
break; break;
default: default:
break; break;

10
lotuswordpro/source/filter/xfilter/xfborders.hxx
View File

@@ -99,9 +99,9 @@ public:
void SetWidthSpace(double space); void SetWidthSpace(double space);
/** /**
* @descr Set outter line width for border with double line. * @descr Set outer line width for border with double line.
*/ */
void SetWidthOutter(double outer); void SetWidthOuter(double outer);
private: private:
/** /**
@@ -122,7 +122,7 @@ private:
sal_Bool m_bSameWidth; sal_Bool m_bSameWidth;
double m_fWidthInner; double m_fWidthInner;
double m_fWidthSpace; double m_fWidthSpace;
double m_fWidthOutter; double m_fWidthOuter;
}; };
/** /**
@@ -163,9 +163,9 @@ public:
void SetWidthSpace(enumXFBorder side, double space); void SetWidthSpace(enumXFBorder side, double space);
/** /**
* @descr Set outter border width of border side. * @descr Set outer border width of border side.
*/ */
void SetWidthOutter(enumXFBorder side, double outer); void SetWidthOuter(enumXFBorder side, double outer);
XFBorder * GetLeft() {return &m_aBorderLeft;} XFBorder * GetLeft() {return &m_aBorderLeft;}

2
lotuswordpro/source/filter/xfilter/xfdefs.hxx
View File

@@ -430,7 +430,7 @@ enum enumXFLineNumberPos
enumXFLineNumberLeft, enumXFLineNumberLeft,
enumXFLineNumberRight, enumXFLineNumberRight,
enumXFLineNumberInner, enumXFLineNumberInner,
enumXFLineNumberOutter, enumXFLineNumberOuter,
}; };
enum enumXFEntry enum enumXFEntry

4
lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
View File

@@ -173,8 +173,8 @@ inline void XFLineNumberConfig::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("text:number-position"), A2OUSTR("right") ); pAttrList->AddAttribute( A2OUSTR("text:number-position"), A2OUSTR("right") );
else if( m_ePosition == enumXFLineNumberInner ) else if( m_ePosition == enumXFLineNumberInner )
pAttrList->AddAttribute( A2OUSTR("text:number-position"), A2OUSTR("inner") ); pAttrList->AddAttribute( A2OUSTR("text:number-position"), A2OUSTR("inner") );
else if( m_ePosition == enumXFLineNumberOutter ) else if( m_ePosition == enumXFLineNumberOuter )
pAttrList->AddAttribute( A2OUSTR("text:number-position"), A2OUSTR("outter") ); pAttrList->AddAttribute( A2OUSTR("text:number-position"), A2OUSTR("outer") );
pAttrList->AddAttribute( A2OUSTR("text:increment"), Int32ToOUString(m_nIncrement) ); pAttrList->AddAttribute( A2OUSTR("text:increment"), Int32ToOUString(m_nIncrement) );