[Libreoffice-commits] core.git: svtools/source svx/inc svx/source
Andrea Gelmini
andrea.gelmini at gelma.net
Tue Sep 29 23:19:40 PDT 2015
svtools/source/table/tablecontrol_impl.hxx | 2 +-
svtools/source/toolpanel/drawerlayouter.cxx | 2 +-
svx/inc/AccessibleTableShape.hxx | 2 +-
svx/inc/float3d.hrc | 2 +-
svx/inc/sdr/overlay/overlaytools.hxx | 2 +-
svx/source/accessibility/AccessibleControlShape.cxx | 2 +-
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 2 +-
svx/source/dialog/charmap.cxx | 2 +-
svx/source/dialog/graphctl.cxx | 2 +-
svx/source/dialog/measctrl.cxx | 2 +-
svx/source/dialog/svxruler.cxx | 2 +-
svx/source/engine3d/view3d.cxx | 6 +++---
svx/source/fmcomp/fmgridcl.cxx | 2 +-
svx/source/fmcomp/gridctrl.cxx | 4 ++--
svx/source/form/filtnav.cxx | 2 +-
15 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit f0733ee8c9de62818867c656518cecf0986dda0f
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Sep 29 18:09:57 2015 +0200
Fix typos
Change-Id: I7bb3caf76909603343f50568b68e3eadeb1cac30
Reviewed-on: https://gerrit.libreoffice.org/18980
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index e34672a..d082e20 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -82,7 +82,7 @@ namespace svt { namespace table
friend class SuspendInvariants;
private:
- /// the control whose impl-instance we implemnt
+ /// the control whose impl-instance we implement
TableControl& m_rAntiImpl;
/// the model of the table control
PTableModel m_pModel;
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index 55be1a2..6ff118a 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -92,7 +92,7 @@ namespace svt
aLowerDrawerPos.Move( 0, -nDrawerHeight );
}
- // fincally calculate the rectangle for the active panel
+ // finally calculate the rectangle for the active panel
return Rectangle(
aUpperDrawerPos,
Size( nWidth, aLowerDrawerPos.Y() - aUpperDrawerPos.Y() + 1 )
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index 1c704ec..4440534 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -133,7 +133,7 @@ public:
// overwrite the SetState & ResetState to do special operation for table cell's internal text
virtual bool SetState (sal_Int16 aState) SAL_OVERRIDE;
virtual bool ResetState (sal_Int16 aState) SAL_OVERRIDE;
- // The following two methods are used to set state directly on table object, instread of the internal cell or paragraph.
+ // The following two methods are used to set state directly on table object, instead of the internal cell or paragraph.
bool SetStateDirectly (sal_Int16 aState);
bool ResetStateDirectly (sal_Int16 aState);
// Get the currently active cell which is text editing
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index d73219f..6f16074 100644
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -33,7 +33,7 @@
#define CTL_PREVIEW 12
#define CTL_LIGHT_PREVIEW 13
-// Geomerty
+// Geometry
#define FT_HORIZONTAL 24
#define NUM_HORIZONTAL 25
#define FT_VERTICAL 26
diff --git a/svx/inc/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx
index 9a6f9fe..9e74d68 100644
--- a/svx/inc/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/sdr/overlay/overlaytools.hxx
@@ -172,7 +172,7 @@ namespace drawinglayer
basegfx::BColor maColor;
double mfTransparence;
- // the dscrete grow and shrink of the box
+ // the discrete grow and shrink of the box
double mfDiscreteGrow;
double mfDiscreteShrink;
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index fe3af84..4432e0e 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -666,7 +666,7 @@ void SAL_CALL AccessibleControlShape::disposing()
}
}
- // forward the disposel to our inner context
+ // forward the disposal to our inner context
if ( m_bDisposeNativeContext )
{
// don't listen for mode changes anymore
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 27c855f..e956768 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -347,7 +347,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
}
delete[] pDXArry;
- // veritcal alignment
+ // vertical alignment
std::vector< FWCharacterData >::iterator aCharacterIter( aParagraphIter->vCharacters.begin() );
std::vector< FWCharacterData >::iterator aCharacterIEnd ( aParagraphIter->vCharacters.end() );
while ( aCharacterIter != aCharacterIEnd )
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 9413edc..d4cba05 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star;
sal_uInt32& SvxShowCharSet::getSelectedChar()
{
- static sal_uInt32 cSelectedChar = ' '; // keeps selected character over app livetime
+ static sal_uInt32 cSelectedChar = ' '; // keeps selected character over app lifetime
return cSelectedChar;
}
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 5b5d360..a013a99 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -159,7 +159,7 @@ void GraphCtrl::InitSdrModel()
pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC );
pView->SetEditMode();
- // #i72889# set neeeded flags
+ // #i72889# set needed flags
pView->SetPagePaintingAllowed(false);
pView->SetBufferedOutputAllowed(true);
pView->SetBufferedOverlayAllowed(true);
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index a341d72..1dc190d 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -86,7 +86,7 @@ void SvxXMeasurePreview::dispose()
{
// No one is deleting the MeasureObj? This is not only an error but also
// a memory leak (!). Main problem is that this object is still listening to
- // a StyleSheet of the model which was set. Thus, if You want to keep the obnject,
+ // a StyleSheet of the model which was set. Thus, if You want to keep the object,
// set the model to 0L, if object is not needed (seems to be the case here),
// delete it.
delete pMeasureObj;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 9d7f8ed..d5f1a65 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -199,7 +199,7 @@ void SvxRuler_Impl::SetPercSize(sal_uInt16 nSize)
// Ruler: SetMargin1, SetMargin2
// SID_RULER_PAGE_POS
-// expectes as parameter the initial value of the page and page width
+// expects as parameter the initial value of the page and page width
// Ruler: SetPagePos
// SID_ATTR_TABSTOP
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 14c5e74..7e498f7 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -307,7 +307,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
SdrObject *pObj = GetMarkedObjectByIndex(nObjs);
if(pObj && pObj->ISA(E3dCompoundObject))
{
- // releated scene
+ // related scene
pScene = static_cast<E3dCompoundObject*>(pObj)->GetScene();
if(pScene)
pScene->SetSelected(false);
@@ -405,7 +405,7 @@ SdrModel* E3dView::GetMarkedObjModel() const
}
}
- // call parent. This will copy all scenes and the selection flags at the 3d objectss. So
+ // call parent. This will copy all scenes and the selection flags at the 3D objects. So
// it will be possible to delete all non-selected 3d objects from the cloned 3d scenes
pNewModel = SdrView::GetMarkedObjModel();
@@ -1449,7 +1449,7 @@ void E3dView::MovAction(const Point& rPnt)
{
const SdrHdlList &aHdlList = GetHdlList ();
- // delete the mirroed polygon, mirrors the original and draws
+ // delete the mirrored polygon, mirrors the original and draws
// it anew
SdrView::MovAction (rPnt);
mpMirrorOverlay->SetMirrorAxis(
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 946ea5d..1ace5f8 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1966,7 +1966,7 @@ void FmGridControl::Select()
{
case SAL_MAX_UINT16: break; // no selection
case 0 : nSelectedColumn = SAL_MAX_UINT16; break;
- // handle col can't be seledted
+ // handle col can't be selected
default :
// get the model col pos instead of the view col pos
nSelectedColumn = GetModelColumnPos(GetColumnIdFromViewPos(nSelectedColumn - 1));
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index f7a190f..fdd2bdd 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2497,7 +2497,7 @@ void DbGridControl::MoveToNext()
if(!bOk)
{
AdjustRows();
- if (m_nTotalCount > 0) // only to avoid infinte recursion
+ if (m_nTotalCount > 0) // only to avoid infinite recursion
MoveToNext();
}
}
@@ -3370,7 +3370,7 @@ void DbGridControl::ShowColumn(sal_uInt16 nId)
}
}
sal_uInt16 nNewViewPos = (nNextNonHidden == BROWSER_INVALIDID)
- ? 1 // there is no visible column -> insert behinde the handle col
+ ? 1 // there is no visible column -> insert behind the handle col
: GetViewColumnPos( m_aColumns[ nNextNonHidden ]->GetId() ) + 1;
// the first non-handle col has "view pos" 0, but the pos arg for InsertDataColumn expects
// a position 1 for the first non-handle col -> +1
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index ea1d6a0..05519e2 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1826,7 +1826,7 @@ void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt)
void FmFilterNavigator::DeleteSelection()
{
// to avoid the deletion of an entry twice (e.g. deletion of a parent and afterward
- // the deletion of its child, i have to shrink the selecton list
+ // the deletion of its child, I have to shrink the selecton list
::std::vector<SvTreeListEntry*> aEntryList;
for (SvTreeListEntry* pEntry = FirstSelected();
pEntry != NULL;
More information about the Libreoffice-commits
mailing list