[Libreoffice-commits] core.git: connectivity/source dbaccess/source dtrans/source editeng/source include/osl include/svx package/source reportdesign/source sc/source sfx2/source svtools/source svx/source sw/source ucb/source vcl/generic vcl/inc vcl/opengl vcl/source vcl/win wizards/com xmloff/source
Andrea Gelmini
andrea.gelmini at gelma.net
Fri Jan 2 12:24:15 PST 2015
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx | 2
dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx | 2
dtrans/source/win32/dtobj/DOTransferable.cxx | 2
editeng/source/items/textitem.cxx | 2
editeng/source/outliner/outleeng.cxx | 2
include/osl/mutex.hxx | 2
include/osl/socket.h | 4 -
include/svx/AccessibleTextHelper.hxx | 8 +--
include/svx/svdsnpv.hxx | 4 -
include/svx/svdtypes.hxx | 2
package/source/xstor/xstorage.cxx | 22 +++++-----
reportdesign/source/ui/report/ViewsWindow.cxx | 2
sc/source/core/data/documen7.cxx | 8 +--
sc/source/core/data/table4.cxx | 2
sc/source/ui/navipi/navipi.cxx | 2
sfx2/source/appl/workwin.cxx | 2
svtools/source/table/tablecontrol_impl.hxx | 4 -
svx/source/form/navigatortree.cxx | 12 ++---
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/inc/scriptinfo.hxx | 2
ucb/source/ucp/tdoc/tdoc_content.cxx | 2
ucb/source/ucp/tdoc/tdoc_uri.cxx | 8 +--
vcl/generic/fontmanager/parseAFM.hxx | 4 -
vcl/inc/unx/wmadaptor.hxx | 2
vcl/opengl/salbmp.cxx | 2
vcl/source/window/split.cxx | 2
vcl/win/source/gdi/gdiimpl.cxx | 4 -
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 2
xmloff/source/core/xmlexp.cxx | 6 +-
29 files changed, 60 insertions(+), 60 deletions(-)
New commits:
commit 3a2b1af87d629a780f0e98559fb8b409378a80c7
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Fri Jan 2 15:51:30 2015 +0100
Fix simple typos.
Change-Id: I1fdbe47ed7a6e05d2cf20f4c296bffad4bbc6599
Reviewed-on: https://gerrit.libreoffice.org/13719
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index a2ea1ea..61f4965 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -208,7 +208,7 @@ MQueryHelperResultEntry*
MQueryHelper::getByIndex( sal_uInt32 nRow )
{
// Row numbers are from 1 to N, need to ensure this, and then
- // substract 1
+ // subtract 1
if ( nRow < 1 ) {
return( NULL );
}
diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
index 6185937..504540f 100644
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
@@ -28,7 +28,7 @@ void OJoinMoveTabWinUndoAct::TogglePosition()
m_pTabWin->SetPosPixel(m_ptNextPosition - ptFrameScrollPos);
- // it looks like ptFrameScrollPos is meaningless, then I substract it here and add it to ptNext, and
+ // it looks like ptFrameScrollPos is meaningless, then I subtract it here and add it to ptNext, and
// next time I subtract again...
// AbetptFrameScrollPos could have changed next time...
m_pOwner->EnsureVisible(m_pTabWin);
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 6198d8d..0b4f985 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -437,7 +437,7 @@ OUString CDOTransferable::byteStreamToOUString( ByteSequence_t& aByteStream )
sal_Int32 nWChars;
sal_Int32 nMemSize = aByteStream.getLength( );
- // if there is a trailing L"\0" substract 1 from length
+ // if there is a trailing L"\0" subtract 1 from length
if ( 0 == aByteStream[ aByteStream.getLength( ) - 2 ] &&
0 == aByteStream[ aByteStream.getLength( ) - 1 ] )
nWChars = static_cast< sal_Int32 >( nMemSize / sizeof( sal_Unicode ) ) - 1;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 16870d9..67f22e5 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -919,7 +919,7 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
// and the prop data; this seems somewhat futile given the various ways how the
// modified height is calculated (with and without conversion between twips and
// 100th mm; with an additional eCoreMetric input in one of the SetHeight
-// overloads), and indeed known to occassionally produce nRet values that would
+// overloads), and indeed known to occasionally produce nRet values that would
// be negative, so just guard against negative results here and throw the hands
// up in despair:
static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUnit eProp, bool bCoreInTwip)
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index db90fda..5525754 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -198,7 +198,7 @@ void OutlinerEditEng::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
pOwner->ImplCheckNumBulletItem( nPara );
// #i100014#
- // It is not a good idea to substract 1 from a count and cast the result
+ // It is not a good idea to subtract 1 from a count and cast the result
// to sal_uInt16 without check, if the count is 0.
pOwner->ImplCheckParagraphs( nPara, pOwner->pParaList->GetParagraphCount() );
diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index ca8c1901..4722cd6 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -221,7 +221,7 @@ namespace osl
pResetT( &rT )
{}
- /** Re-aquires the mutex or interface.
+ /** Re-acquires the mutex or interface.
*/
void reset()
{
diff --git a/include/osl/socket.h b/include/osl/socket.h
index dc958ef6..54840fa 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -427,7 +427,7 @@ SAL_DLLPUBLIC oslSocket SAL_CALL osl_createSocket(
/** Retrieves the Address of the local end of the socket.
Note that a socket must be bound or connected before
- a vaild address can be returned.
+ a valid address can be returned.
@return 0 if socket-address could not be created, otherwise you get
the created Socket-Address.
*/
@@ -435,7 +435,7 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket Socket);
/** Retrieves the Address of the remote end of the socket.
Note that a socket must be connected before
- a vaild address can be returned.
+ a valid address can be returned.
@return 0 if socket-address could not be created, otherwise you get
the created Socket-Address.
*/
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index 2534976..a55a3a1 100644
--- a/include/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
@@ -365,7 +365,7 @@ namespace accessibility
/** Query select state of the text managed by this object
@attention Don't call with locked mutexes. You may hold
- the solar mutex, but this method aquires it anyway.
+ the solar mutex, but this method acquires it anyway.
@return sal_True, if the text or parts of it are currently selected
*/
@@ -376,13 +376,13 @@ namespace accessibility
/** Implements getAccessibleChildCount
@attention Don't call with locked mutexes. You may hold
- the solar mutex, but this method aquires it anyway.
+ the solar mutex, but this method acquires it anyway.
*/
virtual sal_Int32 GetChildCount();
/** Implements getAccessibleChild
@attention Don't call with locked mutexes. You may hold
- the solar mutex, but this method aquires it anyway.
+ the solar mutex, but this method acuires it anyway.
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChild( sal_Int32 i );
@@ -404,7 +404,7 @@ namespace accessibility
/** Implements getAccessibleAt
@attention Don't call with locked mutexes. You may hold
- the solar mutex, but this method aquires it anyway.
+ the solar mutex, but this method acquires it anyway.
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL GetAt( const ::com::sun::star::awt::Point& aPoint );
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index e053326..66d6302 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -111,7 +111,7 @@ public:
void RecalcLogicSnapMagnetic(const OutputDevice& rOut) { SetSnapMagnetic(rOut.PixelToLogic(Size(nMagnSizPix,nMagnSizPix))); }
void SetActualWin(const OutputDevice* pWin) { SdrPaintView::SetActualWin(pWin); if (pWin!=NULL) RecalcLogicSnapMagnetic(*pWin); }
- // Coordinates refered to the view!
+ // Coordinates referred to the view!
// Returnvalues are SDRSNAP_NOTSNAPPED,SDRSNAP_XSNAPPED,
// SDRSNAP_YSNAPPED or SDRSNAP_XYSNAPPED
sal_uInt16 SnapPos(Point& rPnt, const SdrPageView* pPV) const;
@@ -223,7 +223,7 @@ public:
// and the Mouse was dragged from zero to the coordinates
// (80,30). Now there are 2 alternatives to determine the edge length
// of the square: 30 and 80.
- // The standard Ortho-Function took 30 ( everytime the smaller length)
+ // The standard Ortho-Function took 30 (every time the smaller length)
// If BigOrtho is switched on, you get a square with edge length of 80.
// The same also applies to Resize.
// Default value for BigOrtho is on. persistent.
diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx
index 6864cf6..c6845e5 100644
--- a/include/svx/svdtypes.hxx
+++ b/include/svx/svdtypes.hxx
@@ -66,7 +66,7 @@ enum SdrConvertType {SDRCONVERT_POLY, // create pure polygon
// drLayerAdmin::GetLayerID(const String&) returns a value.
#define SDRLAYER_NOTFOUND 0xFF
// You can use this value in the methods of SdrLayerSet, but sal_False is returned
-// everytime or the methode does nothing.
+// every time or the methode does nothing.
// type deklaration for Layer-IDs
typedef sal_uInt8 SdrLayerID;
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 9c345d6..254c2b2 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -766,7 +766,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
xRels->insertRelationships( GetAllRelationshipsIfAny(), sal_False );
}
- // if possible the destination storage should be commited after successful copying
+ // if possible the destination storage should be committed after successful copying
uno::Reference< embed::XTransactedObject > xObjToCommit( xDest, uno::UNO_QUERY );
if ( xObjToCommit.is() )
xObjToCommit->commit();
@@ -996,7 +996,7 @@ void OStorage_Impl::CopyLastCommitTo( const uno::Reference< embed::XStorage >& x
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
- SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "A commited storage is incomplete!" );
+ SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "A committed storage is incomplete!" );
if ( !m_xPackageFolder.is() )
throw uno::RuntimeException( THROW_WHERE );
@@ -1035,10 +1035,10 @@ void OStorage_Impl::Commit()
// in case of a new empty storage it is possible that the contents are still not read
// ( the storage of course has no contents, but the initialization is postponed till the first use,
- // thus if a new storage was created and commited immediately it must be initialized here )
+ // thus if a new storage was created and committed immediately it must be initialized here )
ReadContents();
- // if storage is commited it should have a valid Package representation
+ // if storage is committed it should have a valid Package representation
SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "The package representation should exist!" );
if ( !m_xPackageFolder.is() )
throw embed::InvalidStorageException( THROW_WHERE );
@@ -1049,7 +1049,7 @@ void OStorage_Impl::Commit()
uno::Reference< container::XNameContainer > xNewPackageFolder;
// here the storage will switch to the temporary package folder
- // if the storage was already commited and the parent was not commited after that
+ // if the storage was already committed and the parent was not committed after that
// the switch should not be done since the package folder in use is a temporary one;
// it can be detected by m_bCommited flag ( root storage doesn't need temporary representation )
if ( !m_bCommited && !m_bIsRoot )
@@ -1117,7 +1117,7 @@ void OStorage_Impl::Commit()
if ( !(*pElementIter)->m_bIsInserted )
{
// for now stream is opened in direct mode that means that in case
- // storage is commited all the streams from it are commited in current state.
+ // storage is committed all the streams from it are committed in current state.
// following two steps are separated to allow easily implement transacted mode
// for streams if we need it in future.
// Only hierarchical access uses transacted streams currently
@@ -1126,7 +1126,7 @@ void OStorage_Impl::Commit()
(*pElementIter)->m_pStream->Commit();
// if the storage was not open, there is no need to commit it ???
- // the storage should be checked that it is commited
+ // the storage should be checked that it is committed
if ( (*pElementIter)->m_bIsStorage && (*pElementIter)->m_pStorage && (*pElementIter)->m_pStorage->m_bCommited )
{
// it's temporary PackageFolder should be inserted instead of current one
@@ -1447,7 +1447,7 @@ SotElement_Impl* OStorage_Impl::InsertRawStream( const OUString& aName, const un
// the mode is not needed for storage stream internal implementation
SotElement_Impl* pNewElement = InsertElement( aName, false );
pNewElement->m_pStream = new OWriteStream_Impl( this, xPackageSubStream, m_xPackage, m_xContext, true, m_nStorageType, false );
- // the stream is inserted and must be treated as a commited one
+ // the stream is inserted and must be treated as a committed one
pNewElement->m_pStream->SetToBeCommited();
m_aChildrenList.push_back( pNewElement );
@@ -2016,7 +2016,7 @@ void SAL_CALL OStorage::InternalDispose( bool bNotifyImpl )
delete m_pImpl;
else
{
- // the noncommited changes for the storage must be removed
+ // the non-committed changes for the storage must be removed
m_pImpl->Revert();
}
}
@@ -2084,7 +2084,7 @@ void OStorage::BroadcastModifiedIfNecessary()
void OStorage::BroadcastTransaction( sal_Int8 nMessage )
/*
1 - preCommit
- 2 - commited
+ 2 - committed
3 - preRevert
4 - reverted
*/
@@ -3972,7 +3972,7 @@ void SAL_CALL OStorage::commit()
m_pImpl->Commit(); // the root storage initiates the storing to source
- // when the storage is commited the parent is modified
+ // when the storage is committed the parent is modified
if ( m_pImpl->m_pParent && m_pImpl->m_pParent->m_pAntiImpl )
xParentModif = (util::XModifiable*)m_pImpl->m_pParent->m_pAntiImpl;
}
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 5fb908d..b35e862 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1242,7 +1242,7 @@ void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSe
{
EndDragObj_removeInvisibleObjects();
- // we need to manipulate the current clickpoint, we substract the old delta from BeginDrag
+ // we need to manipulate the current clickpoint, we subtract the old delta from BeginDrag
aNewPos -= m_aDragDelta;
uno::Sequence< beans::NamedValue > aAllreadyCopiedObjects;
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 1871a24..a627f43 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -352,7 +352,7 @@ void ScDocument::RemoveFromFormulaTree( ScFormulaCell* pCell )
OSL_ENSURE( pCell, "RemoveFromFormulaTree: pCell Null" );
ScFormulaCell* pPrev = pCell->GetPrevious();
assert(pPrev != pCell); // pointing to itself?!?
- // if the cell is first or somwhere in chain
+ // if the cell is first or somewhere in chain
if ( pPrev || pFormulaTree == pCell )
{
ScFormulaCell* pNext = pCell->GetNext();
@@ -369,7 +369,7 @@ void ScDocument::RemoveFromFormulaTree( ScFormulaCell* pCell )
if ( pNext )
{
assert(pEOFormulaTree != pCell); // if this cell is also tail something's wrong
- pNext->SetPrevious( pPrev ); // sucessor exists, set predecessor
+ pNext->SetPrevious( pPrev ); // successor exists, set predecessor
}
else
{
@@ -542,7 +542,7 @@ void ScDocument::RemoveFromFormulaTrack( ScFormulaCell* pCell )
OSL_ENSURE( pCell, "RemoveFromFormulaTrack: pCell Null" );
ScFormulaCell* pPrev = pCell->GetPreviousTrack();
assert(pPrev != pCell); // pointing to itself?!?
- // if the cell is first or somwhere in chain
+ // if the cell is first or somewhere in chain
if ( pPrev || pFormulaTrack == pCell )
{
ScFormulaCell* pNext = pCell->GetNextTrack();
@@ -559,7 +559,7 @@ void ScDocument::RemoveFromFormulaTrack( ScFormulaCell* pCell )
if ( pNext )
{
assert(pEOFormulaTrack != pCell); // if this cell is also tail something's wrong
- pNext->SetPreviousTrack( pPrev ); // sucessor exists, set predecessor
+ pNext->SetPreviousTrack( pPrev ); // successor exists, set predecessor
}
else
{
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 2768429..84ee54e 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1451,7 +1451,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
// when filling vertically, the inner position is the row position whereas
// when filling horizontally the column position becomes the inner
// position. The term 'outer' refers to the column position when filling
- // vertically, or the row positon when filling horizontally. The fill is
+ // vertically, or the row position when filling horizontally. The fill is
// performed once in each 'outer' position e.g. when filling vertically,
// we perform the fill once in each column.
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index b30420d..fc4fbbd 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -487,7 +487,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
SetWindow( pNavigator );
// handle configurations elsewhere,
- // onyl size of pInfo matters now
+ // only size of pInfo matters now
Size aInfoSize = pParent->GetOutputSizePixel(); // outside defined size
Size aNavSize = pNavigator->GetOutputSizePixel(); // Default-Size
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 01f827a..2a8d461 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1347,7 +1347,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
sal_uInt16 nId = aObjBarList[n].nId;
bool bDestroy = aObjBarList[n].bDestroy;
- // Determine the vaild mode for the ToolBox
+ // Determine the valid mode for the ToolBox
sal_uInt16 nTbxMode = aObjBarList[n].nMode;
bool bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN ==
( nTbxMode & SFX_VISIBILITY_FULLSCREEN );
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index b7d34bc..0c2da1f 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -407,7 +407,7 @@ namespace svt { namespace table
/** scrolls the view by the given number of rows
The method is not bound to the classes public invariants, as it's used in
- situations where the they must not necessarily be fullfilled.
+ situations where the they must not necessarily be fulfilled.
@return
the number of rows by which the viewport was scrolled. This may differ
@@ -423,7 +423,7 @@ namespace svt { namespace table
/** scrolls the view by the given number of columns
The method is not bound to the classes public invariants, as it's used in
- situations where the they must not necessarily be fullfilled.
+ situations where the they must not necessarily be fulfilled.
@return
the number of columns by which the viewport was scrolled. This may differ
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 5f673cc..879e390 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1678,7 +1678,7 @@ namespace svxform
if ((nSelectedEntries == 0) || bRootSelected) // still root ?
return; // -> only selected element -> leave
- DBG_ASSERT(!m_bPrevSelectionMixed, "NavigatorTree::DeleteSelection() : delete permitted if mark and selection are inconsistant");
+ DBG_ASSERT(!m_bPrevSelectionMixed, "NavigatorTree::DeleteSelection() : delete permitted if mark and selection are inconsistent");
// i need the FormModel later
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
@@ -1688,10 +1688,10 @@ namespace svxform
if (!pFormModel)
return;
- // now i have to safeguard the DeleteList : if you delete a form and a dependent element
- // - in this order - than the SvLBoxEntryPtr of the dependent element is allready invlaid,
- // when it should be deleted ... you have to prohibit this GPF, that of course would happen,
- // so i take the 'normalized' list
+ // now I have to safeguard the DeleteList: if you delete a form and a dependent element
+ // - in this order - than the SvLBoxEntryPtr of the dependent element is already invalid,
+ // when it should be deleted... you have to prohibit this GPF, that of course would happen,
+ // so I take the 'normalized' list
CollectSelectionData( SDI_NORMALIZED );
// see below for why we need this mapping from models to shapes
@@ -1901,7 +1901,7 @@ namespace svxform
{
FmEntryDataArray::iterator it = arredToSelect.find(pCurrent);
if ( it != arredToSelect.end() )
- { // entry allready selected, but also in SelectList
+ { // entry already selected, but also in SelectList
// remove it from there
arredToSelect.erase(it);
} else
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 957ddace..de8917d 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1887,7 +1887,7 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
{
const OUString aString = (*aIt)->GetName();
- /* rFmt is not a vaild successor or predecessor of
+ /* rFmt is not a valid successor or predecessor of
itself */
if (aString != rReference && aString != rFmt.GetName())
{
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 86ac8ec..215c800 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -328,7 +328,7 @@ public:
*/
static bool IsArabicText( const OUString& rTxt, sal_Int32 nStt, sal_Int32 nLen );
-/** Performes a thai justification on the kerning array
+/** Performs a thai justification on the kerning array
@descr Add some extra space for thai justification to the
positions in the kerning array.
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 7ddd154..44b2610 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1926,7 +1926,7 @@ void Content::transfer(
if ( ( rInfo.SourceURL.getLength() < TDOC_URL_SCHEME_LENGTH + 2 ) )
{
- // Invaild length (to short).
+ // Invalid length (to short).
ucbhelper::cancelCommandExecution(
uno::makeAny( ucb::InteractiveBadTransferURLException(
OUString(),
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx
index 8698141..a5eecc1 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx
@@ -49,7 +49,7 @@ void Uri::init() const
// Check for proper length: must be at least length of <sheme>:/
if ( ( m_aUri.getLength() < TDOC_URL_SCHEME_LENGTH + 2 ) )
{
- // Invaild length (to short).
+ // Invalid length (to short).
return;
}
@@ -58,7 +58,7 @@ void Uri::init() const
= m_aUri.copy( 0, TDOC_URL_SCHEME_LENGTH ).toAsciiLowerCase();
if ( aScheme != TDOC_URL_SCHEME )
{
- // Invaild scheme.
+ // Invalid scheme.
return;
}
@@ -67,13 +67,13 @@ void Uri::init() const
if ( m_aUri[ TDOC_URL_SCHEME_LENGTH ] != ':' )
{
- // Invaild (no ':' after <scheme>).
+ // Invalid (no ':' after <scheme>).
return;
}
if ( m_aUri[ TDOC_URL_SCHEME_LENGTH + 1 ] != '/' )
{
- // Invaild (no '/' after <scheme>:).
+ // Invalid (no '/' after <scheme>:).
return;
}
diff --git a/vcl/generic/fontmanager/parseAFM.hxx b/vcl/generic/fontmanager/parseAFM.hxx
index 3f9c7d6..933e2fa 100644
--- a/vcl/generic/fontmanager/parseAFM.hxx
+++ b/vcl/generic/fontmanager/parseAFM.hxx
@@ -74,7 +74,7 @@
*
* There is a procedure in parseAFM.c, called parseFile, that can be
* called from any application wishing to get information from the AFM File.
- * This procedure expects 3 parameters: a vaild file descriptor, a pointer
+ * This procedure expects 3 parameters: a valid file descriptor, a pointer
* to a (FontInfo *) variable (for which space will be allocated and then
* will be filled in with the data requested), and a mask specifying
* which data from the AFM File should be saved in the FontInfo structure.
@@ -126,7 +126,7 @@ namespace psp {
* parser went on. This could include problems like the count for any given
* section does not add up to how many entries there actually were, or
* there was a key that was not recognized. The return record may contain
- * vaild data or it may not.
+ * valid data or it may not.
*
* earlyEOF means that an End of File was encountered before expected. This
* may mean that the AFM file had been truncated, or improperly formed.
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index d5fcb32..091f4c1 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -174,7 +174,7 @@ public:
virtual ~WMAdaptor();
/*
- * creates a vaild WMAdaptor instance for the SalDisplay
+ * creates a valid WMAdaptor instance for the SalDisplay
*/
static WMAdaptor* createWMAdaptor( SalDisplay* );
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 61d8358..bc94939 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -494,7 +494,7 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode )
if( !maPendingOps.empty() )
{
- SAL_INFO( "vcl.opengl", "** Creating texture and reading it back immediatly" );
+ SAL_INFO( "vcl.opengl", "** Creating texture and reading it back immediately" );
if( !CreateTexture() || !AllocateUserData() || !ReadTexture() )
return NULL;
}
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 60efeb9..fe8a3f7 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -471,7 +471,7 @@ void Splitter::StartDrag()
// Tracking starten
StartTracking();
- // Start-Positon ermitteln
+ // Start-Position ermitteln
maDragPos = mpRefWin->GetPointerPosPixel();
ImplSplitMousePos( maDragPos );
Splitting( maDragPos );
diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/source/gdi/gdiimpl.cxx
index 6c133e6..9601643 100644
--- a/vcl/win/source/gdi/gdiimpl.cxx
+++ b/vcl/win/source/gdi/gdiimpl.cxx
@@ -513,7 +513,7 @@ void WinSalGraphicsImpl::copyArea( long nDestX, long nDestY,
{
// hInvalidateRgn contains the fully visible parts of the original srcRect
hTempRgn = CreateRectRgnIndirect( &aSrcRect );
- // substract it from the original rect to get the occluded parts
+ // subtract it from the original rect to get the occluded parts
int nRgnType = CombineRgn( hInvalidateRgn, hTempRgn, hInvalidateRgn, RGN_DIFF );
DeleteRegion( hTempRgn );
@@ -942,7 +942,7 @@ SalBitmap* WinSalGraphicsImpl::getBitmap( long nX, long nY, long nDX, long nDY )
}
else
{
- // #124826# avoid resource leak ! happens when runing without desktop access (remote desktop, service, may be screensavers)
+ // #124826# avoid resource leak! Happens when running without desktop access (remote desktop, service, may be screensavers)
DeleteBitmap( hBmpBitmap );
}
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index e3092bd..c2d47b7 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -339,7 +339,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
{
int GroupCount = CurDBMetaData.GroupFieldNames.length;
DBColumn CurDBColumn;
- // Note for some reason the table might lose its name and has to be renamed therefor
+ // Note for some reason the table might lose its name and has to be renamed therefore
String OldTableName = CurRecordTable.xTableName.getName();
if (OldTableName.compareTo(TBLRECORDSECTION) != 0)
{
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 2c78e1a..3de55bf 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2438,7 +2438,7 @@ SvXMLExport::AddAttributeIdLegacy(
sal_uInt16 const nLegacyPrefix, OUString const& rValue)
{
switch (getDefaultVersion()) {
- case SvtSaveOptions::ODFVER_011: // fall thru
+ case SvtSaveOptions::ODFVER_011: // fall through
case SvtSaveOptions::ODFVER_010: break;
default: // ODF 1.2: xml:id
AddAttribute(XML_NAMESPACE_XML, XML_ID, rValue);
@@ -2454,7 +2454,7 @@ SvXMLExport::AddAttributeXmlId(uno::Reference<uno::XInterface> const & i_xIfc)
{
// check version >= 1.2
switch (getDefaultVersion()) {
- case SvtSaveOptions::ODFVER_011: // fall thru
+ case SvtSaveOptions::ODFVER_011: // fall through
case SvtSaveOptions::ODFVER_010: return;
default: break;
}
@@ -2505,7 +2505,7 @@ SvXMLExport::AddAttributesRDFa(
{
// check version >= 1.2
switch (getDefaultVersion()) {
- case SvtSaveOptions::ODFVER_011: // fall thru
+ case SvtSaveOptions::ODFVER_011: // fall through
case SvtSaveOptions::ODFVER_010: return;
default: break;
}
More information about the Libreoffice-commits
mailing list