[Libreoffice-commits] core.git: accessibility/inc accessibility/source android/source avmedia/source basctl/source basebmp/source basegfx/source basic/source Makefile.in
Andrea Gelmini
andrea.gelmini at gelma.net
Tue Jan 5 05:41:15 PST 2016
Makefile.in | 2 +-
accessibility/inc/accessibility/helper/accresmgr.hxx | 2 +-
accessibility/source/extended/AccessibleGridControl.cxx | 2 +-
android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 4 ++--
android/source/src/java/org/mozilla/gecko/gfx/Axis.java | 2 +-
avmedia/source/gstreamer/gstplayer.cxx | 2 +-
basctl/source/basicide/baside2b.cxx | 4 ++--
basctl/source/basicide/macrodlg.cxx | 2 +-
basebmp/source/bitmapdevice.cxx | 2 +-
basegfx/source/curve/b2dcubicbezier.cxx | 2 +-
basegfx/source/matrix/b3dhommatrix.cxx | 2 +-
basegfx/source/polygon/b2dpolygonclipper.cxx | 4 ++--
basegfx/source/polygon/b2dtrapezoid.cxx | 2 +-
basegfx/source/polygon/b3dpolygontools.cxx | 2 +-
basegfx/source/raster/rasterconvert3d.cxx | 2 +-
basic/source/runtime/runtime.cxx | 2 +-
16 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit fbec6ac08999a36664571dc0b1eba3ba251a5984
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Mon Jan 4 12:22:58 2016 +0100
Fix typos
Change-Id: I3fba2c76c83381eb398c80947ef4849bccf7ab27
Reviewed-on: https://gerrit.libreoffice.org/21078
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/Makefile.in b/Makefile.in
index 51a2e61..3bfd09f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -206,7 +206,7 @@ get-submodules:
ifneq ($(foreach i,$(GIT_NEEDED_SUBMODULES),$(i)/.git),$(wildcard $(foreach i,$(GIT_NEEDED_SUBMODULES),$(i)/.git)))
cd $(SRCDIR) && ./g -f clone
endif
- @cd $(SRCDIR) && ./g -z # make sure the git hooks are in place enen if no submodules are needed
+ @cd $(SRCDIR) && ./g -z # make sure the git hooks are in place even if no submodules are needed
else # these sources are from a tarball, so get the other source tarballs
gb_LO_VER := $(shell . $(SRCDIR)/sources.ver && echo $$lo_sources_ver)
diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx b/accessibility/inc/accessibility/helper/accresmgr.hxx
index 311fb16..9e27881 100644
--- a/accessibility/inc/accessibility/helper/accresmgr.hxx
+++ b/accessibility/inc/accessibility/helper/accresmgr.hxx
@@ -42,7 +42,7 @@ private:
~TkResMgr() { }
// we'll instantiate one static member of the following class,
- // which in it's dtor ensures that m_pImpl will be deleted
+ // which in its dtor ensures that m_pImpl will be deleted
class EnsureDelete
{
public:
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 98e3b28..c1e81e9 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -307,7 +307,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex )
AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable()
{
Reference< XAccessible > xCreator(m_xImpl->m_aCreator);
- OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleGirdControl::createAccessibleTable: my creator died - how this?" );
+ OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleGridControl::createAccessibleTable: my creator died - how this?" );
return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE );
}
diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 29229e1..148a98c 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -533,7 +533,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements ActionBa
startActivity(new Intent(getApplicationContext(), SettingsActivity.class));
return true;
case R.id.menu_storage_preferences:
- startActivity(new Intent(this, DocumentProviderSettingsActivity.class));;
+ startActivity(new Intent(this, DocumentProviderSettingsActivity.class));
break;
default:
@@ -617,7 +617,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements ActionBa
Log.d(LOGTAG, currentDirectory.toString() + Integer.toString(filterMode) + Integer.toString(viewMode));
//prefs.edit().putInt(EXPLORER_VIEW_TYPE, viewType).commit();
- Log.d(LOGTAG, "savedInstanceSate");
+ Log.d(LOGTAG, "savedInstanceState");
}
@Override
diff --git a/android/source/src/java/org/mozilla/gecko/gfx/Axis.java b/android/source/src/java/org/mozilla/gecko/gfx/Axis.java
index 61407cb..d4a7ac2 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/Axis.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/Axis.java
@@ -317,7 +317,7 @@ abstract class Axis {
// if overscroll is disabled and we're trying to overscroll, reset the displacement
// to remove any excess. Using getExcess alone isn't enough here since it relies on
- // getOverscroll which doesn't take into account any new displacment being applied
+ // getOverscroll which doesn't take into account any new displacement being applied
if (getOverScrollMode() == View.OVER_SCROLL_NEVER) {
if (mDisplacement + getOrigin() < getPageStart()) {
mDisplacement = getPageStart() - getOrigin();
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 5a01252..fef123fd 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -212,7 +212,7 @@ void MissingPluginInstaller::detach(Player const * source) {
}
}
if (join.is()) {
- // missing cancelability of gst_install_plugins_sync
+ // missing cancellability of gst_install_plugins_sync
join->join();
}
}
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 7c87314..5935206 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -713,7 +713,7 @@ void EditorWindow::HandleAutoCloseParen()
if( aLine.getLength() > 0 && aLine[aSel.GetEnd().GetIndex()-1] != '(' )
{
GetEditView()->InsertText(")");
- //leave the cursor on it's place: inside the parenthesis
+ //leave the cursor on its place: inside the parenthesis
TextPaM aEnd(nLine, aSel.GetEnd().GetIndex());
GetEditView()->SetSelection( TextSelection( aEnd, aEnd ) );
}
@@ -734,7 +734,7 @@ void EditorWindow::HandleAutoCloseDoubleQuotes()
if( aLine.getLength() > 0 && !aLine.endsWith("\"") && (aPortions.back().tokenType != TT_STRING) )
{
GetEditView()->InsertText("\"");
- //leave the cursor on it's place: inside the two double quotes
+ //leave the cursor on its place: inside the two double quotes
TextPaM aEnd(nLine, aSel.GetEnd().GetIndex());
GetEditView()->SetSelection( TextSelection( aEnd, aEnd ) );
}
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 93815be..83a5ed4 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::uno;
MacroChooser::MacroChooser( vcl::Window* pParnt, bool bCreateEntries )
: SfxModalDialog(pParnt, "BasicMacroDialog", "modules/BasicIDE/ui/basicmacrodialog.ui")
, bNewDelIsDel(true)
- // the Sfx doesn't ask the BasicManger whether modified or not
+ // the Sfx doesn't ask the BasicManager whether modified or not
// => start saving in case of a change without a into the BasicIDE.
, bForceStoreBasic(false)
, nMode(All)
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 9469d56..201d870 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1158,7 +1158,7 @@ struct ImplBitmapDevice
clip masks/alpha masks/bitmaps that don't match our exact
bitmap format.
- This is to avoid the combinatorical explosion when dealing
+ This is to avoid the combinatorial explosion when dealing
with n bitmap formats, which could be combined with n clip
masks, alpha masks and bitmap masks (yielding a total of n^4
combinations). Since each BitmapRenderer is specialized for
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index 8521145..612922a 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -294,7 +294,7 @@ namespace basegfx
}
else
{
- // stop recustion
+ // stop recursion
nMaxRecursionDepth = 0;
}
}
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx
index dac62a9..2d017dd 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.cxx
@@ -351,7 +351,7 @@ namespace basegfx
aVUV.normalize();
aVPN.normalize();
- // build x-axis as peroendicular fron aVUV and aVPN
+ // build x-axis as perpendicular fron aVUV and aVPN
B3DVector aRx(aVUV.getPerpendicular(aVPN));
aRx.normalize();
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 73eb785..7087c54 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -233,7 +233,7 @@ namespace basegfx
// the four implied half-planes, but the outer part is not.
// It is possible for strokes, but with creating unnecessary extra
// cuts, so using clipPolygonOnPolyPolygon is better there, too.
- // This needs to be done with the topology knowlegde and is unfurtunately
+ // This needs to be done with the topology knowlegde and is unfortunately
// more expensive, too.
const B2DPolygon aClip(createPolygonFromRect(rRange));
@@ -773,7 +773,7 @@ namespace basegfx
// we need to clip this triangle against the output rectangle
// to ensure that the resulting texture coordinates are in
- // the valid range from [0<=st<=1]. under normal circustances
+ // the valid range from [0<=st<=1]. under normal circumstances
// we could use the BORDERCOLOR renderstate but some cards
// seem to ignore this feature.
::basegfx::B2DPoint stack[3];
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index c9ded97..2b6db06 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -32,7 +32,7 @@ namespace basegfx
// helper class to hold a simple edge. This is only used for horizontal edges
// currently, thus the YPositions will be equal. I did not create a special
- // class for this since holdingthe pointers is more effective and also can be
+ // class for this since holding the pointers is more effective and also can be
// used as baseclass for the traversing edges
class TrDeSimpleEdge
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
index 7f537ab..279e0ec 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -386,7 +386,7 @@ namespace basegfx
else if(fTools::equal(fY, fOne))
{
// point is a south polar point, no useful X-coordinate can be created. Set
- // Y-coordinte, though
+ // Y-coordinate, though
if(bChangeY)
{
aTexCoor.setY(fOne);
diff --git a/basegfx/source/raster/rasterconvert3d.cxx b/basegfx/source/raster/rasterconvert3d.cxx
index 9b27826..a2b3b69 100644
--- a/basegfx/source/raster/rasterconvert3d.cxx
+++ b/basegfx/source/raster/rasterconvert3d.cxx
@@ -61,7 +61,7 @@ namespace basegfx
OSL_ENSURE(nStopLine >= nStartLine, "nStopLine is bigger than nStartLine (!)");
// sort global entries by Y, X once. After this, the vector
- // is seen as frozen. Pointers to it's entries will be used in the following code.
+ // is seen as frozen. Pointers to its entries will be used in the following code.
::std::sort(maLineEntries.begin(), maLineEntries.end());
// local parameters
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 36e82c1..6535118 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -4536,7 +4536,7 @@ void SbiRuntime::StepLOCAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
void SbiRuntime::StepPUBLIC_Impl( sal_uInt32 nOp1, sal_uInt32 nOp2, bool bUsedForClassModule )
{
OUString aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
- SbxDataType t = (SbxDataType)(SbxDataType)(nOp2 & 0xffff);;
+ SbxDataType t = (SbxDataType)(SbxDataType)(nOp2 & 0xffff);
bool bFlag = pMod->IsSet( SbxFlagBits::NoModify );
pMod->SetFlag( SbxFlagBits::NoModify );
SbxVariableRef p = pMod->Find( aName, SbxCLASS_PROPERTY );
More information about the Libreoffice-commits
mailing list