[Libreoffice-commits] core.git: fpicker/source lotuswordpro/source sc/inc sc/source svx/source toolkit/source
Julien Nabet
serval2412 at yahoo.fr
Thu Mar 23 06:13:37 UTC 2017
fpicker/source/win32/filepicker/PreviewCtrl.cxx | 4 +-
lotuswordpro/source/filter/lwpborderstuff.cxx | 48 ++++++++++++------------
lotuswordpro/source/filter/lwpborderstuff.hxx | 8 ++--
sc/inc/document.hxx | 2 -
sc/source/core/data/documen2.cxx | 10 ++---
svx/source/form/fmcontrolbordermanager.cxx | 12 +++---
toolkit/source/helper/formpdfexport.cxx | 6 +--
7 files changed, 45 insertions(+), 45 deletions(-)
New commits:
commit 9f5b1c4f2afb5844007f1bd24761acd72908cb4f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Mar 22 22:44:38 2017 +0100
Typo: boder->border
Change-Id: I46940c5b584f93b478b1dfca9aa66e036fe951c2
Reviewed-on: https://gerrit.libreoffice.org/35547
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 861b73adb9c0..b979b0c98029 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -35,7 +35,7 @@
#define HIMETRIC_INCH 2540
// means 3 pixel left and 3 pixel right
-#define HORZ_BODER_SPACE 6
+#define HORZ_BORDER_SPACE 6
// means 3 pixel top and 3 pixel bottom
#define VERT_BORDER_SPACE 6
@@ -109,7 +109,7 @@ namespace
sal_Int32 nWidthWnd = _getWidthRect( rect );
sal_Int32 nHeightWnd = _getHeightRect( rect );
- return ( ( ( nWidthWnd - HORZ_BODER_SPACE ) >= aPicSize.m_cx ) &&
+ return ( ( ( nWidthWnd - HORZ_BORDER_SPACE ) >= aPicSize.m_cx ) &&
( ( nHeightWnd - VERT_BORDER_SPACE ) >= aPicSize.m_cy ) );
}
diff --git a/lotuswordpro/source/filter/lwpborderstuff.cxx b/lotuswordpro/source/filter/lwpborderstuff.cxx
index af80668639d8..7c099e820a29 100644
--- a/lotuswordpro/source/filter/lwpborderstuff.cxx
+++ b/lotuswordpro/source/filter/lwpborderstuff.cxx
@@ -67,10 +67,10 @@ LwpBorderStuff::LwpBorderStuff()
m_nSides = 0;
m_nValid = 0;
- m_nBoderGroupIDLeft = 0;
- m_nBoderGroupIDRight = 0;
- m_nBoderGroupIDTop = 0;
- m_nBoderGroupIDBottom = 0;
+ m_nBorderGroupIDLeft = 0;
+ m_nBorderGroupIDRight = 0;
+ m_nBorderGroupIDTop = 0;
+ m_nBorderGroupIDBottom = 0;
m_nGroupIndent = 0;
@@ -85,7 +85,7 @@ void LwpBorderStuff::Read(LwpObjectStream *pStrm)
m_nSides = pStrm->QuickReaduInt16();
if( m_nSides&LEFT )
{
- m_nBoderGroupIDLeft = pStrm->QuickReaduInt16();
+ m_nBorderGroupIDLeft = pStrm->QuickReaduInt16();
m_nWidthLeft = pStrm->QuickReadInt32();
m_aColorLeft.Read(pStrm);
@@ -97,7 +97,7 @@ void LwpBorderStuff::Read(LwpObjectStream *pStrm)
if( m_nSides&RIGHT )
{
- m_nBoderGroupIDRight = pStrm->QuickReaduInt16();
+ m_nBorderGroupIDRight = pStrm->QuickReaduInt16();
m_nWidthRight = pStrm->QuickReadInt32();
m_aColorRight.Read(pStrm);
@@ -109,7 +109,7 @@ void LwpBorderStuff::Read(LwpObjectStream *pStrm)
if( m_nSides&TOP )
{
- m_nBoderGroupIDTop = pStrm->QuickReaduInt16();
+ m_nBorderGroupIDTop = pStrm->QuickReaduInt16();
m_nWidthTop = pStrm->QuickReadInt32();
m_aColorTop.Read(pStrm);
@@ -121,7 +121,7 @@ void LwpBorderStuff::Read(LwpObjectStream *pStrm)
if( m_nSides&BOTTOM )
{
- m_nBoderGroupIDBottom = pStrm->QuickReaduInt16();
+ m_nBorderGroupIDBottom = pStrm->QuickReaduInt16();
m_nWidthBottom = pStrm->QuickReadInt32();
m_aColorBottom.Read(pStrm);
@@ -137,21 +137,21 @@ void LwpBorderStuff::Read(LwpObjectStream *pStrm)
if( LwpFileHeader::m_nFileRevision < 0x0010 )
{
- if( m_nBoderGroupIDLeft&EXTERNAL_ID )
+ if( m_nBorderGroupIDLeft&EXTERNAL_ID )
{
- m_nBoderGroupIDLeft = BGRP_SOLID;
+ m_nBorderGroupIDLeft = BGRP_SOLID;
}
- if( m_nBoderGroupIDRight&EXTERNAL_ID )
+ if( m_nBorderGroupIDRight&EXTERNAL_ID )
{
- m_nBoderGroupIDRight = BGRP_SOLID;
+ m_nBorderGroupIDRight = BGRP_SOLID;
}
- if( m_nBoderGroupIDTop&EXTERNAL_ID )
+ if( m_nBorderGroupIDTop&EXTERNAL_ID )
{
- m_nBoderGroupIDTop = BGRP_SOLID;
+ m_nBorderGroupIDTop = BGRP_SOLID;
}
- if( m_nBoderGroupIDBottom&EXTERNAL_ID )
+ if( m_nBorderGroupIDBottom&EXTERNAL_ID )
{
- m_nBoderGroupIDBottom = BGRP_SOLID;
+ m_nBorderGroupIDBottom = BGRP_SOLID;
}
}
}
@@ -166,13 +166,13 @@ sal_uInt16 LwpBorderStuff::GetSideType(sal_uInt16 side)
switch(side)
{
case LEFT:
- return m_nBoderGroupIDLeft;
+ return m_nBorderGroupIDLeft;
case RIGHT:
- return m_nBoderGroupIDRight;
+ return m_nBorderGroupIDRight;
case TOP:
- return m_nBoderGroupIDTop;
+ return m_nBorderGroupIDTop;
case BOTTOM:
- return m_nBoderGroupIDBottom;
+ return m_nBorderGroupIDBottom;
}
// FIXME: this is needed to avoid warning: control reaches end of non-void function
// a better solution would be to enum value for the parameter side
@@ -220,10 +220,10 @@ LwpBorderStuff& LwpBorderStuff::operator = (const LwpBorderStuff& rOther)
m_nSides = rOther.m_nSides;
m_nValid = rOther.m_nValid;
- m_nBoderGroupIDLeft = rOther.m_nBoderGroupIDLeft;
- m_nBoderGroupIDRight = rOther.m_nBoderGroupIDRight;
- m_nBoderGroupIDTop = rOther.m_nBoderGroupIDTop;
- m_nBoderGroupIDBottom = rOther.m_nBoderGroupIDBottom;
+ m_nBorderGroupIDLeft = rOther.m_nBorderGroupIDLeft;
+ m_nBorderGroupIDRight = rOther.m_nBorderGroupIDRight;
+ m_nBorderGroupIDTop = rOther.m_nBorderGroupIDTop;
+ m_nBorderGroupIDBottom = rOther.m_nBorderGroupIDBottom;
m_nGroupIndent = rOther.m_nGroupIndent;
diff --git a/lotuswordpro/source/filter/lwpborderstuff.hxx b/lotuswordpro/source/filter/lwpborderstuff.hxx
index 7e1dae9f66ec..d98682161add 100644
--- a/lotuswordpro/source/filter/lwpborderstuff.hxx
+++ b/lotuswordpro/source/filter/lwpborderstuff.hxx
@@ -92,10 +92,10 @@ private:
sal_uInt16 m_nSides;
sal_uInt16 m_nValid;
- sal_uInt16 m_nBoderGroupIDLeft;
- sal_uInt16 m_nBoderGroupIDRight;
- sal_uInt16 m_nBoderGroupIDTop;
- sal_uInt16 m_nBoderGroupIDBottom;
+ sal_uInt16 m_nBorderGroupIDLeft;
+ sal_uInt16 m_nBorderGroupIDRight;
+ sal_uInt16 m_nBorderGroupIDTop;
+ sal_uInt16 m_nBorderGroupIDBottom;
sal_Int32 m_nGroupIndent;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index fc1db73c7147..8310e973dfc3 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -484,7 +484,7 @@ private:
bool mbFinalTrackFormulas : 1;
public:
- bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
+ bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBorder);
void GetCellChangeTrackNote(const ScAddress &cell, OUString &strTrackText, bool &pbLeftEdge);
bool IsUsingEmbededFonts() { return mbUseEmbedFonts; }
void SetIsUsingEmbededFonts( bool bUse ) { mbUseEmbedFonts = bUse; }
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index ca777799cb95..d9149ff1788f 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1277,7 +1277,7 @@ void ScDocument::ClearLookupCaches()
pLookupCacheMapImpl->clear();
}
-bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
+bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBorder)
{
ScChangeTrack* pTrack = GetChangeTrack();
ScChangeViewSettings* pSettings = GetChangeViewSettings();
@@ -1305,11 +1305,11 @@ bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
{
if (aRange.In(cell))
{
- if (pColCellBoder != nullptr)
+ if (pColCellBorder != nullptr)
{
aColorChanger.Update( *pAction );
Color aColor( aColorChanger.GetColor() );
- *pColCellBoder = aColor;
+ *pColCellBorder = aColor;
}
return true;
}
@@ -1325,11 +1325,11 @@ bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
{
if (aRange.In(cell))
{
- if (pColCellBoder != nullptr)
+ if (pColCellBorder != nullptr)
{
aColorChanger.Update( *pAction );
Color aColor( aColorChanger.GetColor() );
- *pColCellBoder = aColor;
+ *pColCellBorder = aColor;
}
return true;
}
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index 7e7a5a0eb32c..9390ffb0dcfa 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -67,21 +67,21 @@ namespace svxform
}
- static void getBorder( const Reference< XVclWindowPeer >& _rxPeer, BorderDescriptor& _rBoder )
+ static void getBorder( const Reference< XVclWindowPeer >& _rxPeer, BorderDescriptor& _rBorder )
{
OSL_ENSURE( _rxPeer.is(), "getBorder: invalid peer!" );
- OSL_VERIFY( _rxPeer->getProperty( FM_PROP_BORDER ) >>= _rBoder.nBorderType );
- OSL_VERIFY( _rxPeer->getProperty( FM_PROP_BORDERCOLOR ) >>= _rBoder.nBorderColor );
+ OSL_VERIFY( _rxPeer->getProperty( FM_PROP_BORDER ) >>= _rBorder.nBorderType );
+ OSL_VERIFY( _rxPeer->getProperty( FM_PROP_BORDERCOLOR ) >>= _rBorder.nBorderColor );
}
- static void setBorder( const Reference< XVclWindowPeer >& _rxPeer, const BorderDescriptor& _rBoder )
+ static void setBorder( const Reference< XVclWindowPeer >& _rxPeer, const BorderDescriptor& _rBorder )
{
OSL_ENSURE( _rxPeer.is(), "setBorder: invalid peer!" );
- _rxPeer->setProperty( FM_PROP_BORDER, makeAny( _rBoder.nBorderType ) );
- _rxPeer->setProperty( FM_PROP_BORDERCOLOR, makeAny( _rBoder.nBorderColor ) );
+ _rxPeer->setProperty( FM_PROP_BORDER, makeAny( _rBorder.nBorderType ) );
+ _rxPeer->setProperty( FM_PROP_BORDERCOLOR, makeAny( _rBorder.nBorderColor ) );
}
ControlBorderManager::ControlBorderManager()
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index e02ba19bbdfa..0503a57edd23 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -313,9 +313,9 @@ namespace toolkitform
OUString sBorderColorPropertyName( "BorderColor" );
if ( xPSI->hasPropertyByName( sBorderColorPropertyName ) )
{
- sal_Int32 nBoderColor = COL_TRANSPARENT;
- if ( xModelProps->getPropertyValue( sBorderColorPropertyName ) >>= nBoderColor )
- Descriptor->BorderColor = Color( nBoderColor );
+ sal_Int32 nBorderColor = COL_TRANSPARENT;
+ if ( xModelProps->getPropertyValue( sBorderColorPropertyName ) >>= nBorderColor )
+ Descriptor->BorderColor = Color( nBorderColor );
else
Descriptor->BorderColor = Color( COL_BLACK );
}
More information about the Libreoffice-commits
mailing list