summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2018-09-02 06:16:28 +0200
committerJulien Nabet <serval2412@yahoo.fr>2018-09-27 12:14:06 +0200
commitd71859ed79eef8d0d76ea93530fe708b0effdc80 (patch)
tree58cdbd13e8b777a7afec9a2dd363e1e6ae3304e2
parent1534025a0386584a7b8f3f929b10ce5eb33257cf (diff)
Fix typos
Change-Id: Icfe120db02a70d43e4120d1f4cbb2704640d3990 Reviewed-on: https://gerrit.libreoffice.org/59470 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r--sd/source/ui/func/fudraw.cxx2
-rw-r--r--sd/source/ui/view/viewshe3.cxx4
-rw-r--r--sd/source/ui/view/viewshel.cxx4
-rw-r--r--starmath/source/visitors.cxx2
-rw-r--r--svx/source/svdraw/svdmrkv.cxx2
-rw-r--r--svx/source/table/tablecontroller.cxx2
-rw-r--r--sw/inc/ndtxt.hxx2
-rw-r--r--sw/inc/swtable.hxx2
-rw-r--r--sw/qa/extras/README2
-rw-r--r--sw/source/core/layout/trvlfrm.cxx2
-rw-r--r--sw/source/core/layout/wsfrm.cxx2
-rw-r--r--sw/source/core/undo/docundo.cxx8
-rw-r--r--sw/source/core/view/viewsh.cxx2
-rw-r--r--toolkit/qa/cppunit/UnitConversion.cxx2
-rw-r--r--vcl/README.scheduler2
-rw-r--r--vcl/source/window/dndeventdispatcher.cxx2
-rw-r--r--wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java2
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java2
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx2
19 files changed, 24 insertions, 24 deletions
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 76d3edf027a3..0f4fb18cd173 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -520,7 +520,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
{
// The goal of this request is show always the rotation arrow for 3D-objects at rotation mode
// Independent of the settings at Tools->Options->Draw "Objects always moveable"
- // 2D-objects acquit in an other way. Otherwise, the rotation of 3d-objects around any axes
+ // 2D-objects acquit in another way. Otherwise, the rotation of 3d-objects around any axes
// wouldn't be possible per default.
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
SdrObject* pObject = rMarkList.GetMark(0)->GetMarkedSdrObj();
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 53b3d3ce4052..73edd5dc7bc8 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -129,7 +129,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
{
if(pUndoManager->GetUndoActionCount() != 0)
{
- // If an other view created the first undo action, prevent redoing it from this view.
+ // If another view created the first undo action, prevent redoing it from this view.
const SfxUndoAction* pAction = pUndoManager->GetUndoAction();
if (pAction->GetViewShellId() != GetViewShellBase().GetViewShellId())
{
@@ -158,7 +158,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
{
if(pUndoManager->GetRedoActionCount() != 0)
{
- // If an other view created the first undo action, prevent redoing it from this view.
+ // If another view created the first undo action, prevent redoing it from this view.
const SfxUndoAction* pAction = pUndoManager->GetRedoAction();
if (pAction->GetViewShellId() != GetViewShellBase().GetViewShellId())
{
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index ddcd4dc0b344..5e57c1e3f3f7 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1257,7 +1257,7 @@ void ViewShell::ImpSidUndo(SfxRequest& rReq)
{
if (comphelper::LibreOfficeKit::isActive() && !bRepair)
{
- // If an other view created the first undo action, prevent redoing it from this view.
+ // If another view created the first undo action, prevent redoing it from this view.
const SfxUndoAction* pAction = pUndoManager->GetUndoAction();
if (pAction->GetViewShellId() != GetViewShellBase().GetViewShellId())
{
@@ -1325,7 +1325,7 @@ void ViewShell::ImpSidRedo(SfxRequest& rReq)
{
if (comphelper::LibreOfficeKit::isActive() && !bRepair)
{
- // If an other view created the first undo action, prevent redoing it from this view.
+ // If another view created the first undo action, prevent redoing it from this view.
const SfxUndoAction* pAction = pUndoManager->GetRedoAction();
if (pAction->GetViewShellId() != GetViewShellBase().GetViewShellId())
{
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index 3d7d7c7545bc..c2808b4ff186 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -1452,7 +1452,7 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmPlaceNode* pNode )
/** SmErrorNode is context dependent metadata, it can't be selected
*
* @remarks There's no point in deleting, copying and/or moving an instance
- * of SmErrorNode as it may not exist in an other context! Thus there are no
+ * of SmErrorNode as it may not exist in another context! Thus there are no
* positions to select an SmErrorNode.
*/
void SmCaretPosGraphBuildingVisitor::Visit( SmErrorNode* )
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 7a9048761e0c..16f21be65a76 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -786,7 +786,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
{
if (pOtherShell)
{
- // An other shell wants to know about our existing
+ // Another shell wants to know about our existing
// selection.
if (pViewShell != pOtherShell)
SfxLokHelper::notifyOtherView(pViewShell, pOtherShell, LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", sSelection);
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index f44b24daed84..df7868920f6f 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -3176,7 +3176,7 @@ bool SvxTableController::setCursorLogicPosition(const Point& rPosition, bool bPo
}
else if (aCellPos != maMouseDownPos)
{
- // No selection, but rPosition is at an other cell: start table selection.
+ // No selection, but rPosition is at another cell: start table selection.
StartSelection(maMouseDownPos);
// Update graphic selection, should be hidden now.
mrView.AdjustMarkHdl();
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index dde56486e0a7..d84c3053533c 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -413,7 +413,7 @@ public:
const SwTextFormatColl* pNew );
/** Copy collection with all auto formats to dest-node.
- The latter might be in an other document!
+ The latter might be in another document!
(Method in ndcopy.cxx!!). */
void CopyCollFormat( SwTextNode& rDestNd );
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 595785583643..84663b3ca3e4 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -283,7 +283,7 @@ public:
SwUndoTableCpyTable* pUndo );
bool InsNewTable( const SwTable& rCpyTable, const SwSelBoxes&,
SwUndoTableCpyTable* pUndo );
- // Copy headline of table (with content!) into an other one.
+ // Copy headline of table (with content!) into another one.
void CopyHeadlineIntoTable( SwTableNode& rTableNd );
// Get box, whose start index is set on nBoxStt.
diff --git a/sw/qa/extras/README b/sw/qa/extras/README
index ff6425a8eb43..d68d785d2571 100644
--- a/sw/qa/extras/README
+++ b/sw/qa/extras/README
@@ -47,7 +47,7 @@ import problem in fact -- and once after the export and import.
=== Direct XPath assertions
-An other alternative is to assert the resulted export document directly.
+Another alternative is to assert the resulted export document directly.
Currently this is only implemented for DOCX, which is a zipped XML, so it's
possible to evaluate XPath checks. A check looks like this:
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 2f076858fbfe..8c8574d3be21 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -533,7 +533,7 @@ bool SwCellFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
//Problem: If two Flys have the same size and share the same position then
//they end inside each other.
-//Because we recursively check if a Point doesn't randomly lie inside an other
+//Because we recursively check if a Point doesn't randomly lie inside another
//fly which lies completely inside the current Fly we could trigger an endless
//loop with the mentioned situation above.
//Using the helper class SwCursorOszControl we prevent the recursion. During
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 23a726218d52..36ae515e767a 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2917,7 +2917,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo )
nullptr != (pCnt = static_cast<SwFootnoteFrame*>(this)->GetRefFromAttr() ) )
{
if ( pCnt->IsFollow() )
- { // If we are in an other column/page than the frame with the
+ { // If we are in another column/page than the frame with the
// reference, we don't need to invalidate its master.
SwFrame *pTmp = pCnt->FindFootnoteBossFrame(true) == FindFootnoteBossFrame(true)
? &pCnt->FindMaster()->GetFrame() : pCnt;
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 42daf1a4e58a..8181c5fe1589 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -111,7 +111,7 @@ size_t UndoManager::GetUndoActionCount(const bool bCurrentLevel) const
if (!m_bRepair)
{
- // If an other view created the last undo action, prevent undoing it from this view.
+ // If another view created the last undo action, prevent undoing it from this view.
ViewShellId nViewShellId = m_pView->GetViewShellId();
if (pAction->GetViewShellId() != nViewShellId)
nRet = 0;
@@ -135,7 +135,7 @@ size_t UndoManager::GetRedoActionCount(const bool bCurrentLevel) const
if (m_pView && !m_bRepair)
{
- // If an other view created the first redo action, prevent redoing it from this view.
+ // If another view created the first redo action, prevent redoing it from this view.
ViewShellId nViewShellId = m_pView->GetViewShellId();
if (pAction->GetViewShellId() != nViewShellId)
nRet = 0;
@@ -367,7 +367,7 @@ UndoManager::GetLastUndoInfo(
if (comphelper::LibreOfficeKit::isActive() && !m_bRepair)
{
- // If an other view created the undo action, prevent undoing it from this view.
+ // If another view created the undo action, prevent undoing it from this view.
ViewShellId nViewShellId = pView ? pView->GetViewShellId() : m_pDocShell->GetView()->GetViewShellId();
if (pAction->GetViewShellId() != nViewShellId)
{
@@ -430,7 +430,7 @@ bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr,
if (comphelper::LibreOfficeKit::isActive() && !m_bRepair)
{
- // If an other view created the undo action, prevent redoing it from this view.
+ // If another view created the undo action, prevent redoing it from this view.
ViewShellId nViewShellId = pView ? pView->GetViewShellId() : m_pDocShell->GetView()->GetViewShellId();
if (pAction->GetViewShellId() != nViewShellId)
{
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index c3d04941164c..e2e855394e3a 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -313,7 +313,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
//JP 27.11.97: what hid the selection, must also Show it,
// else we get Paint errors!
// e.g. additional mode, page half visible vertically, in the
- // middle a selection and with an other cursor jump to left
+ // middle a selection and with another cursor jump to left
// right border. Without ShowCursor the selection disappears.
bool bShowCursor = pRegion && dynamic_cast<const SwCursorShell*>(this) != nullptr;
if( bShowCursor )
diff --git a/toolkit/qa/cppunit/UnitConversion.cxx b/toolkit/qa/cppunit/UnitConversion.cxx
index 62fe284e8d5a..342eaf18c21e 100644
--- a/toolkit/qa/cppunit/UnitConversion.cxx
+++ b/toolkit/qa/cppunit/UnitConversion.cxx
@@ -95,7 +95,7 @@ void checkSize(uno::Reference<awt::XUnitConversion> const& xConv, awt::Size cons
* The real test function
* 2. try to create an empty window
* 3. try to convert the WindowPeer to an XWindow
- * 4. try to resize and move the window to an other position, so we get a well knowing position and size.
+ * 4. try to resize and move the window to another position, so we get a well knowing position and size.
* 5. run some more tests
*/
void ToolkitTest::testXUnitConversion()
diff --git a/vcl/README.scheduler b/vcl/README.scheduler
index 47edd9283c42..b7d7b61b30f7 100644
--- a/vcl/README.scheduler
+++ b/vcl/README.scheduler
@@ -220,7 +220,7 @@ the system message wasn't already our timer. As a result we can also skip the
polling. All this is one more reason to drop the single message processing
in favour of always processing all pending (system) events.
-There is an other special case, we have to handle: window updates during move
+There is another special case, we have to handle: window updates during move
and resize of windows. These system actions run in their own nested message
loop. So we have to completely switch to timers, even for 0ms. But these
posted events prevent any event processing, while we're busy. The only viable
diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx
index 0b0059914259..4f74d092aac3 100644
--- a/vcl/source/window/dndeventdispatcher.cxx
+++ b/vcl/source/window/dndeventdispatcher.cxx
@@ -94,7 +94,7 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde )
vcl::Window* pChildWindow = findTopLevelWindow(location);
- // handle the case that drop is in an other vcl window than the last dragOver
+ // handle the case that drop is in another vcl window than the last dragOver
if( pChildWindow != m_pCurrentWindow.get() )
{
// fire dragExit on listeners of previous window
diff --git a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java
index 8f1446f0e1fc..ad7993df0ddc 100644
--- a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java
+++ b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java
@@ -96,7 +96,7 @@ public interface IReportBuilderLayouter
void layout();
/**
- * Initialize the current Layouter with data's out of an other Layouter.
+ * Initialize the current Layouter with data's out of another Layouter.
*
* This Method copies the internal fields, groups and titles
*/
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
index a30cdeeb9383..8553ea471028 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
@@ -712,7 +712,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
* Use 'convertToFieldName(dbfield)' to convert a dbfield name in the right.
*
* @param _xSection in which section the formatted field will store
- * @param _sFormattedfield as String a dbfield or an other function
+ * @param _sFormattedfield as String a dbfield or another function
* @param _aRect .X, .Y are the absolute position (1/100mm) where the formatted field will set
* @param _nWidth the width of the field in 1/100mm
* @param _aSO
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 257b6bbad683..527c0b941517 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1624,7 +1624,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
rContext->Insert(ePropertyId, uno::makeAny( nIntValue != 0 ));
break;
case NS_ooxml::LN_EG_RPrBase_smallCaps:
- // If smallcaps would be just disabled and an other casemap is already inserted, don't do anything.
+ // If smallcaps would be just disabled and another casemap is already inserted, don't do anything.
if (nIntValue || !rContext->isSet(ePropertyId) )
rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? style::CaseMap::SMALLCAPS : style::CaseMap::NONE));
m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "smallCaps", OUString::number(nIntValue));