[Libreoffice-commits] core.git: qadevOOo/runner scripting/examples scripting/java scripting/source sc/source sd/source svtools/source svx/source sw/inc
Andrea Gelmini
andrea.gelmini at gelma.net
Sat Oct 1 20:08:40 UTC 2016
qadevOOo/runner/lib/StatusException.java | 2 -
sc/source/ui/vba/vbarange.cxx | 2 -
scripting/examples/beanshell/Capitalise/capitalise.bsh | 2 -
scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 2 -
scripting/source/basprov/basscript.hxx | 2 -
scripting/source/provider/ActiveMSPList.cxx | 2 -
scripting/source/provider/MasterScriptProvider.cxx | 2 -
sd/source/core/CustomAnimationEffect.cxx | 4 +-
sd/source/core/EffectMigration.cxx | 2 -
sd/source/core/PageListWatcher.cxx | 2 -
sd/source/filter/html/htmlex.cxx | 2 -
svtools/source/misc/filechangedchecker.cxx | 2 -
svtools/source/svrtf/rtfout.cxx | 2 -
svx/source/customshapes/EnhancedCustomShape2d.cxx | 2 -
svx/source/form/filtnav.cxx | 4 +-
svx/source/svdraw/svdoashp.cxx | 2 -
svx/source/table/tablecontroller.cxx | 12 +++---
svx/source/xoutdev/xattr.cxx | 18 +++++-----
sw/inc/anchoredobject.hxx | 2 -
19 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 0d4996862b5df79fd601eff6193d5718f8f84047
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Sat Oct 1 15:45:53 2016 +0200
Fix typos
Change-Id: I9701cc93a9f4315e71c133237fdd96ef6964c8ff
Reviewed-on: https://gerrit.libreoffice.org/29438
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/qadevOOo/runner/lib/StatusException.java b/qadevOOo/runner/lib/StatusException.java
index 328fc4f..98ca686 100644
--- a/qadevOOo/runner/lib/StatusException.java
+++ b/qadevOOo/runner/lib/StatusException.java
@@ -20,7 +20,7 @@ package lib;
/**
* StatusException is used to pass a Status object from a test code which is
- * terminated abnormaly. In many cases this is because of an exception thrown,
+ * terminated abnormally. In many cases this is because of an exception thrown,
* but that can also be any other event that hinders the test execution.
*/
public class StatusException extends RuntimeException {
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 70f0f9b..a49e5a2 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3083,7 +3083,7 @@ ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const un
}
ScGlobal::SetSearchItem( newOptions );
- // ignore MatchByte for the moment, its not supported in
+ // ignore MatchByte for the moment, it's not supported in
// OOo.org afaik
uno::Reference< util::XSearchDescriptor > xSearch( xDescriptor, uno::UNO_QUERY );
diff --git a/scripting/examples/beanshell/Capitalise/capitalise.bsh b/scripting/examples/beanshell/Capitalise/capitalise.bsh
index 206a849..6b68e01 100644
--- a/scripting/examples/beanshell/Capitalise/capitalise.bsh
+++ b/scripting/examples/beanshell/Capitalise/capitalise.bsh
@@ -63,7 +63,7 @@ void capitalise() {
UnoRuntime.queryInterface(XText.class, xTextRange.getText());
xWordCursor = (XWordCursor)
UnoRuntime.queryInterface(XWordCursor.class, xText.createTextCursorByRange(xTextRange));
- // move the Word cursor to the start of the word if its not
+ // move the Word cursor to the start of the word if it's not
// already there
if(!xWordCursor.isStartOfWord()) {
xWordCursor.gotoStartOfWord(false);
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 004fe2b..6341b51 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -137,7 +137,7 @@ public class ScriptMetaData extends ScriptEntry {
}
} else if (pathToParcel.contains(UNO_SHARED_PACKAGES1) ||
pathToParcel.contains(UNO_SHARED_PACKAGES2)) {
- //its a package
+ //it's a package
placeHolder = "share:uno_packages";
String unoPkg = parent.parent.getName();
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index cf964a8..cf530d6 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -57,7 +57,7 @@ namespace basprov
m_xDocumentScriptContext;
// hack, OPropertyContainer doesn't allow you to define a property of unknown
// type ( I guess because an Any can't contain an Any... I've always wondered why?
- // as its not unusual to do that in corba )
+ // as it's not unusual to do that in corba )
css::uno::Sequence< css::uno::Any > m_caller;
protected:
// OPropertySetHelper
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index a591ee5..5859b4b 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -103,7 +103,7 @@ ActiveMSPList::getMSPFromAnyContext( const Any& aContext )
try
{
// the component supports executing scripts embedded in a - possibly foreign document.
- // Check whether this other document its the component itself.
+ // Check whether this other document it's the component itself.
if ( !xModel.is() || ( xModel != xScriptContext->getScriptContainer() ) )
{
msp = getMSPFromInvocationContext( xScriptContext );
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index df823d8..7c6157d 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -304,7 +304,7 @@ throw ( provider::ScriptFrameworkErrorException,
Reference< provider::XScript > xScript;
// If the script location is in the same location context as this
- // MSP then delete to the lanaguage provider controlled by this MSP
+ // MSP then delete to the language provider controlled by this MSP
// ** Special case is BASIC, all calls to getScript will be handled
// by the language script provider in the current location context
// even if its different
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index da8d1bd..b7e9bea 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -313,7 +313,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
{
xEnumeration->nextElement() >>= xParagraph;
- // skip this if its not the only paragraph we want to count
+ // skip this if it's not the only paragraph we want to count
if( (nOnlyPara != -1) && (nOnlyPara != nPara ) )
continue;
@@ -2496,7 +2496,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( const CustomAnimatio
}
else
{
- // reuse first effect if its not yet used
+ // reuse first effect if it's not yet used
pNewEffect = pEffect;
bUsed = true;
aInsertIter = find( pNewEffect );
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 140c240..cac2596 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -1169,7 +1169,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos
/** Returns the position of the given SdrObject in the Presentation order.
* This function returns -1 if the SdrObject is not in the Presentation order
- * or if its the path-object.
+ * or if it's the path-object.
*/
sal_Int32 EffectMigration::GetPresentationOrder( SvxShape* pShape )
{
diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx
index a0c0771..cb05d4b 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -109,7 +109,7 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum)
}
case PK_HANDOUT:
{
-// #11420# for models used to transfer drawing shapes via clipboard its ok to not have a handout page
+// #11420# for models used to transfer drawing shapes via clipboard it's ok to not have a handout page
DBG_ASSERT(nPgNum == 0L, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)");
if (nPgNum == 0)
pRetval = mpHandoutPage;
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index e495a5f..28141c3 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -2199,7 +2199,7 @@ void HtmlExport::CreateFileNames()
OUString const & HtmlExport::getDocumentTitle()
{
- // check for a title object in this page, if its the first
+ // check for a title object in this page, if it's the first
// title it becomes this documents title for the content
// page
if( !mbHeader )
diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx
index 85f9a63..17361fc 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -30,7 +30,7 @@ FileChangedChecker::FileChangedChecker(const OUString& rFilename,
void FileChangedChecker::resetTimer()
{
- //Start the Idle if its not active
+ //Start the Idle if it's not active
if(!mIdle.IsActive())
mIdle.Start();
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 250f9e6..68ccedd 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -95,7 +95,7 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
else
{
//If we can't convert to the dest encoding, or if
- //its an uncommon multibyte sequence which most
+ //it's an uncommon multibyte sequence which most
//readers won't be able to handle correctly, then
//If we can't convert to the dest encoding, then
//export as unicode
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index a3b0847..91bd8af 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -704,7 +704,7 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
// of the constructed helper SdrObjects. This would lead to problems since the shadow
// of one helper object would fall on one helper object behind it (e.g. with the
// eyes of the smiley shape). This is not wanted; instead a single shadow 'behind'
- // the AutoShape visualisation is wanted. This is done with primitive functionailty
+ // the AutoShape visualisation is wanted. This is done with primitive functionality
// now in SdrCustomShapePrimitive2D::create2DDecomposition, but only for 2D objects
// (see there and in EnhancedCustomShape3d::Create3DObject to read more).
// This exception may be removed later when AutoShapes will create primitives directly.
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index eba73ac..10dc8b7 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -792,7 +792,7 @@ void FmFilterModel::Remove(FmFilterData* pData)
{
FmFilterItem& rFilterItem = dynamic_cast<FmFilterItem&>(*pData);
- // if its the last condition remove the parent
+ // if it's the last condition remove the parent
if (rItems.size() == 1)
Remove(rFilterItem.GetParent());
else
@@ -1631,7 +1631,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
ScopedVclPtrInstance<PopupMenu> aContextMenu(SVX_RES(RID_FM_FILTER_MENU));
- // every condition could be deleted except the first one if its the only one
+ // every condition could be deleted except the first one if it's the only one
aContextMenu->EnableItem( SID_FM_DELETE, !aSelectList.empty() );
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 9482d25..ea37cf6 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1200,7 +1200,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons
}
else
{
- // check if its the default segment description ( M L Z N )
+ // check if it's the default segment description ( M L Z N )
if ( seqSegments1.getLength() == 4 )
{
if ( ( seqSegments1[ 0 ].Command == EnhancedCustomShapeSegmentCommand::MOVETO )
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 939930e..9385ca8 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2230,7 +2230,7 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem,
{
// current cell is outside the selection
- if( (nCellFlags & ( CELL_BEFORE|CELL_AFTER)) == 0 ) // check if its not nw or ne corner
+ if( (nCellFlags & ( CELL_BEFORE|CELL_AFTER)) == 0 ) // check if it's not nw or ne corner
{
if( nCellFlags & CELL_UPPER )
{
@@ -2243,7 +2243,7 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem,
rNewFrame.SetLine( nullptr, SvxBoxItemLine::TOP );
}
}
- else if( (nCellFlags & ( CELL_UPPER|CELL_LOWER)) == 0 ) // check if its not sw or se corner
+ else if( (nCellFlags & ( CELL_UPPER|CELL_LOWER)) == 0 ) // check if it's not sw or se corner
{
if( nCellFlags & CELL_BEFORE )
{
@@ -2315,7 +2315,7 @@ static void ImplApplyBorderLineItem( sal_uInt16 nCellFlags, const SvxBorderLine*
{
if( (nCellFlags & ( CELL_BEFORE|CELL_AFTER|CELL_UPPER|CELL_LOWER)) != 0 )
{
- if( (nCellFlags & ( CELL_BEFORE|CELL_AFTER)) == 0 ) // check if its not nw or ne corner
+ if( (nCellFlags & ( CELL_BEFORE|CELL_AFTER)) == 0 ) // check if it's not nw or ne corner
{
if( nCellFlags & CELL_UPPER )
{
@@ -2328,7 +2328,7 @@ static void ImplApplyBorderLineItem( sal_uInt16 nCellFlags, const SvxBorderLine*
ImplSetLinePreserveColor( rNewFrame, pBorderLineItem, SvxBoxItemLine::TOP );
}
}
- else if( (nCellFlags & ( CELL_UPPER|CELL_LOWER)) == 0 ) // check if its not sw or se corner
+ else if( (nCellFlags & ( CELL_UPPER|CELL_LOWER)) == 0 ) // check if it's not sw or se corner
{
if( nCellFlags & CELL_BEFORE )
{
@@ -2882,14 +2882,14 @@ void lcl_MergeCommonBorderAttr(LinesState& rLinesState, const SvxBoxItem& rCellB
{
// current cell is outside the selection
- if( (nCellFlags & ( CELL_BEFORE|CELL_AFTER)) == 0 ) // check if its not nw or ne corner
+ if( (nCellFlags & ( CELL_BEFORE|CELL_AFTER)) == 0 ) // check if it's not nw or ne corner
{
if( nCellFlags & CELL_UPPER )
lcl_MergeBorderLine(rLinesState, rCellBoxItem.GetBottom(), SvxBoxItemLine::TOP, SvxBoxInfoItemValidFlags::TOP);
else if( nCellFlags & CELL_LOWER )
lcl_MergeBorderLine(rLinesState, rCellBoxItem.GetTop(), SvxBoxItemLine::BOTTOM, SvxBoxInfoItemValidFlags::BOTTOM);
}
- else if( (nCellFlags & ( CELL_UPPER|CELL_LOWER)) == 0 ) // check if its not sw or se corner
+ else if( (nCellFlags & ( CELL_UPPER|CELL_LOWER)) == 0 ) // check if it's not sw or se corner
{
if( nCellFlags & CELL_BEFORE )
lcl_MergeBorderLine(rLinesState, rCellBoxItem.GetRight(), SvxBoxItemLine::LEFT, SvxBoxInfoItemValidFlags::LEFT);
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 1190037..1eea3d8 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -151,7 +151,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u
if( pItem && ( pItem->GetName() == pCheckItem->GetName() ) )
{
// if there is already an item with the same name and the same
- // value its ok to set it
+ // value it's ok to set it
if( !pCompareValueFunc( pItem, pCheckItem ) )
{
// same name but different value, we need a new name for this item
@@ -1395,7 +1395,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
{
// if there is already an item with the same name and the same
- // value its ok to set it
+ // value it's ok to set it
if( pItem->GetLineStartValue() != pLineStartItem->GetLineStartValue() )
{
// same name but different value, we need a new name for this item
@@ -1417,7 +1417,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
{
// if there is already an item with the same name and the same
- // value its ok to set it
+ // value it's ok to set it
if( pItem->GetLineEndValue() != pLineStartItem->GetLineStartValue() )
{
// same name but different value, we need a new name for this item
@@ -1441,7 +1441,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
{
// if there is already an item with the same name and the same
- // value its ok to set it
+ // value it's ok to set it
if( pItem->GetLineStartValue() != pLineStartItem->GetLineStartValue() )
{
// same name but different value, we need a new name for this item
@@ -1462,7 +1462,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
{
// if there is already an item with the same name and the same
- // value its ok to set it
+ // value it's ok to set it
if( pItem->GetLineEndValue() != pLineStartItem->GetLineStartValue() )
{
// same name but different value, we need a new name for this item
@@ -1678,7 +1678,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
{
// if there is already an item with the same name and the same
- // value its ok to set it
+ // value it's ok to set it
if( pItem->GetLineStartValue() != pLineEndItem->GetLineEndValue() )
{
// same name but different value, we need a new name for this item
@@ -1700,7 +1700,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
{
// if there is already an item with the same name and the same
- // value its ok to set it
+ // value it's ok to set it
if( pItem->GetLineEndValue() != pLineEndItem->GetLineEndValue() )
{
// same name but different value, we need a new name for this item
@@ -1724,7 +1724,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
{
// if there is already an item with the same name and the same
- // value its ok to set it
+ // value it's ok to set it
if( pItem->GetLineStartValue() != pLineEndItem->GetLineEndValue() )
{
// same name but different value, we need a new name for this item
@@ -1745,7 +1745,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
{
// if there is already an item with the same name and the same
- // value its ok to set it
+ // value it's ok to set it
if( pItem->GetLineEndValue() != pLineEndItem->GetLineEndValue() )
{
// same name but different value, we need a new name for this item
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index ec4264d..a91b530 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -68,7 +68,7 @@ class SW_DLLPUBLIC SwAnchoredObject
SwTwips mnLastTopOfLine;
// for to-paragraph and to-character anchored objects:
- // Layout frame vertical position is orient at - typically its the upper
+ // Layout frame vertical position is orient at - typically it's the upper
// of the anchor frame, but it could also by the upper of a follow or
// a following layout frame in the text flow.
const SwLayoutFrame* mpVertPosOrientFrame;
More information about the Libreoffice-commits
mailing list