[Libreoffice-commits] core.git: svx/source
Andrea Gelmini
andrea.gelmini at gelma.net
Thu Oct 1 04:20:34 PDT 2015
svx/source/form/fmobj.cxx | 2
svx/source/form/fmshimp.cxx | 2
svx/source/form/navigatortree.cxx | 40 +++++++-------
svx/source/form/navigatortreemodel.cxx | 2
svx/source/gengal/gengal.cxx | 2
svx/source/inc/docrecovery.hxx | 6 +-
svx/source/sdr/contact/viewcontactofe3dpolygon.cxx | 2
svx/source/sdr/contact/viewcontactofe3dscene.cxx | 2
svx/source/sdr/contact/viewcontactofgraphic.cxx | 6 +-
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx | 2
svx/source/sdr/contact/viewcontactofsdrole2obj.cxx | 2
svx/source/sdr/contact/viewobjectcontact.cxx | 2
svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx | 2
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 2
14 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 28803c28bda0c4bc3d94acf023d8eb96990c8f14
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Oct 1 13:15:39 2015 +0200
Fix typos
Change-Id: I6743b9e73e510eb0664cbbe727dad9fce01fc13e
Reviewed-on: https://gerrit.libreoffice.org/18981
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index cd977a4..603a988 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -420,7 +420,7 @@ namespace
// get the content's relative pos within its parent container
sal_Int32 nPos = getElementPos(xParent, xChild);
- // prepend this current relaive pos
+ // prepend this current relative pos
sCurrentIndex = OUString::number(nPos);
if (!sReturn.isEmpty())
{
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 554bcf0..3819193 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2862,7 +2862,7 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod
if ( !xControl.is() )
{
- // fallabck (some controls might not have been created, yet, since they were never visible so far)
+ // fallback (some controls might not have been created, yet, since they were never visible so far)
Reference< XControl > xContainerControl( xControlContainer, UNO_QUERY_THROW );
const vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerControl->getPeer() );
ENSURE_OR_THROW( pContainerWindow, "unexpected control container implementation" );
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 835beff..7861e3fa 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -203,7 +203,7 @@ namespace svxform
if (IsEditingActive())
CancelTextEditing();
- m_bDragDataDirty = true; // as a precaution, although i dont drag
+ m_bDragDataDirty = true; // as a precaution, although I don't drag
}
GetNavModel()->UpdateContent( pFormShell );
@@ -341,7 +341,7 @@ namespace svxform
// update my selection data
CollectSelectionData(SDI_ALL);
- // if there is at least one no-root-entry and the root selected, i deselect root
+ // if there is at least one no-root-entry and the root selected, I deselect root
if ( (m_arrCurrentSelection.size() > 1) && m_bRootSelected )
{
Select( m_pRootEntry, false );
@@ -351,7 +351,7 @@ namespace svxform
DBG_ASSERT( (m_arrCurrentSelection.size() > 0) || m_bRootSelected, "no entries selected" );
- // shouldn't happen, because i would have selected one during call to IsSelected,
+ // shouldn't happen, because I would have selected one during call to IsSelected,
// if there was none before
@@ -382,7 +382,7 @@ namespace svxform
aContextMenu.EnableItem( SID_COPY, !m_bRootSelected && implAllowExchange( DND_ACTION_COPY ) );
aContextMenu.EnableItem( SID_PASTE, implAcceptPaste( ) );
- // TabDialog, if exaclty one form
+ // TabDialog, if exactly one form
aContextMenu.EnableItem( SID_FM_TAB_DIALOG, bSingleSelection && m_nFormsSelected );
// in XML forms, we don't allow for the properties of a form
@@ -597,7 +597,7 @@ namespace svxform
NULL, false, 0, NULL );
}
else if (!m_bMarkingObjects && dynamic_cast<const FmNavRequestSelectHint*>(&rHint))
- { // if m_bMarkingObjects is sal_True, i mark objects myself
+ { // if m_bMarkingObjects is sal_True, I mark objects myself
// and because of the synchronous mechanism, its exactly the hint,
// which was triggered by myself, and thus can be ignored
FmNavRequestSelectHint* pershHint = const_cast<FmNavRequestSelectHint*>(static_cast<const FmNavRequestSelectHint*>(&rHint));
@@ -605,8 +605,8 @@ namespace svxform
SynchronizeSelection(arredToSelect);
if (pershHint->IsMixedSelection())
- // in this case i deselect all, although the view had a mixed selection
- // during next selection, i must adapt the navigator to the view
+ // in this case I deselect all, although the view had a mixed selection
+ // during next selection, I must adapt the navigator to the view
m_bPrevSelectionMixed = true;
}
}
@@ -659,18 +659,18 @@ namespace svxform
return;
// delete entry from TreeListBox
- // i'm not allowed, to treat the selection, which i trigger:
+ // I'm not allowed, to treat the selection, which I trigger:
// select changes the MarkList of the view, if somebody else does this at the same time
// and removes a selection, we get a problem
// e.g. Group controls with open navigator
LockSelectionHandling();
- // little problem : i remember the selected data, but if somebody deletes one of these entries,
- // i get inconsistent ... this would be bad
+ // little problem: I remember the selected data, but if somebody deletes one of these entries,
+ // I get inconsistent... this would be bad
Select(pEntry, false);
// selection can be modified during deletion,
- // but because i disabled SelectionHandling, i have to do it later
+ // but because I disabled SelectionHandling, I have to do it later
sal_uIntPtr nExpectedSelectionCount = GetSelectionCount();
if( pEntry )
@@ -679,7 +679,7 @@ namespace svxform
if (nExpectedSelectionCount != GetSelectionCount())
SynchronizeSelection();
- // by default i treat the selection of course
+ // by default I treat the selection of course
UnlockSelectionHandling();
}
@@ -780,11 +780,11 @@ namespace svxform
if ( m_bDragDataDirty || !bHasDefControlFormat )
{
if (!bHasControlPathFormat)
- // i am in the shell/page, which has the contorls, but i have no format,
+ // I am in the shell/page, which has the controls, but I have no format,
// which survived the shell change (SVX_FM_CONTROLS_AS_PATH)
return DND_ACTION_NONE;
- // i must recreate the list of the ExchangeObjects, because the shell was changed during dragging
+ // I must recreate the list of the ExchangeObjects, because the shell was changed during dragging
// (there are SvLBoxEntries in it, and we lost them during change)
m_aControlExchange->buildListFromPath(this, m_pRootEntry);
m_bDragDataDirty = false;
@@ -895,7 +895,7 @@ namespace svxform
{
// restart counting
m_aTimerCounter = DROP_ACTION_TIMER_INITIAL_TICKS;
- // remember pos, because i get AcceptDrops, although mouse hasn't moved
+ // remember pos, because I get AcceptDrops, although mouse hasn't moved
m_aTimerTriggered = aDropPos;
// start Timer
if (!m_aDropActionTimer.IsActive()) // exist Timer?
@@ -939,8 +939,8 @@ namespace svxform
bool bForeignCollection = _rData.getFormsRoot().get() != GetNavModel()->GetFormPage()->GetForms().get();
DBG_ASSERT(!bForeignCollection || bHasHiddenControlsFormat, "NavigatorTree::implExecuteDataTransfer: invalid format (AcceptDrop shouldn't have let this pass) !");
DBG_ASSERT(bForeignCollection || !m_bDragDataDirty, "NavigatorTree::implExecuteDataTransfer: invalid state (shell changed since last exchange resync) !");
- // this should be done in AcceptDrop : the list of conrtols is created in _rData
- // and m_bDragDataDirty is reseted
+ // this should be done in AcceptDrop: the list of controls is created in _rData
+ // and m_bDragDataDirty is resetted
#endif
if ( DND_ACTION_COPY == _nAction )
@@ -1718,7 +1718,7 @@ namespace svxform
// because deletion is done by the view, and i build on its MarkList,
// but normally only direct controls, no indirect ones, are marked in a marked form,
- // i have to do it later
+ // I have to do it later
if (bIsForm)
MarkViewObj(static_cast<FmFormData*>(pCurrent), true, true); // second sal_True means "deep"
@@ -1790,7 +1790,7 @@ namespace svxform
continue;
// one remaining subtile problem, before deleting it : if it's a form and the shell
- // knows it as CurrentObject, i have to tell it something else
+ // knows it as CurrentObject, I have to tell it something else
if (dynamic_cast<const FmFormData*>( pCurrent) != nullptr)
{
Reference< XForm > xCurrentForm( static_cast< FmFormData* >( pCurrent )->GetFormIface() );
@@ -1996,7 +1996,7 @@ namespace svxform
}
}
- // if PropertyBrowser is open, i have to adopt it according to my selection
+ // if PropertyBrowser is open, I have to adopt it according to my selection
// (Not as MarkList of view : if a form is selected, all belonging controls are selected in the view
// but of course i want to see the form-properties
ShowSelectionProperties();
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 87d0670..15f95ec 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -557,7 +557,7 @@ namespace svxform
Insert(pSubFormData, CONTAINER_APPEND);
- // new branch, if SubForm contains Subfroms itself
+ // new branch, if SubForm contains Subforms itself
FillBranch(pSubFormData);
}
else
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 0fd4ec9..8b76877 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -9,7 +9,7 @@
// Include this before stdio.h for the __MINGW32__ sake.
-// This header contails a define that modifies the way
+// This header contains a define that modifies the way
// formatting strings work for the mingw platforms.
#include <sal/types.h>
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 71f5b68..ae8d738 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -510,14 +510,14 @@ class RecoveryDialog : public Dialog
css::uno::Reference< css::task::XStatusIndicator > m_xProgress;
enum EInternalRecoveryState
{
- E_RECOVERY_PREPARED, // dialog started ... recovery prepared
+ E_RECOVERY_PREPARED, // dialog started... recovery prepared
E_RECOVERY_IN_PROGRESS, // recovery core still in progress
E_RECOVERY_CORE_DONE, // recovery core finished it's task
E_RECOVERY_DONE, // user clicked "next" button
E_RECOVERY_CANCELED, // user clicked "cancel" button
E_RECOVERY_CANCELED_BEFORE, // user clicked "cancel" button before recovery was started
- E_RECOVERY_CANCELED_AFTERWARDS, // user clicked "cancel" button after reovery was finished
- E_RECOVERY_HANDLED // the recovery wizard page was shown already ... and will be shown now again ...
+ E_RECOVERY_CANCELED_AFTERWARDS, // user clicked "cancel" button after recovery was finished
+ E_RECOVERY_HANDLED // the recovery wizard page was shown already... and will be shown now again...
};
sal_Int32 m_eRecoveryState;
bool m_bWaitForCore;
diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
index c9710dd..5b5116e 100644
--- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
@@ -153,7 +153,7 @@ namespace sdr
// a long time ago. Since the API allows creation of this SDrObject type, it is not possible to
// simply change this definition. Only the chart should use it, and at least this object type
// only exists at Runtime (is not saved and/or loaded in any FileFormat). Still someone external
- // may have used it in it's API. To not risk wrong 3D lightings, i have to switch the orientation
+ // may have used it in it's API. To not risk wrong 3D lightings, I have to switch the orientation
// of the polygon here
aPolyPolygon3D.flip();
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index 36f24da..08aa36a 100644
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
@@ -77,7 +77,7 @@ void createSubPrimitive3DVector(
// add created content to all target
drawinglayer::primitive3d::appendPrimitive3DReferenceToPrimitive3DSequence(o_rAllTarget, xReference);
- // add created content to visibiel target if exists
+ // add created content to visible target if exists
if(o_pVisibleTarget)
{
drawinglayer::primitive3d::appendPrimitive3DReferenceToPrimitive3DSequence(*o_pVisibleTarget, xReference);
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 0319a05..cf1d95d 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -74,9 +74,9 @@ namespace sdr
{
// #i102380# The graphic is swapped out. To let that have an effect ist is necessary to
// delete copies of the GraphicObject which are not swapped out and have no SwapHandler set
- // (this is what happnes when the GraphicObject gets copied to a SdrGrafPrimitive2D). This
+ // (this is what happens when the GraphicObject gets copied to a SdrGrafPrimitive2D). This
// is best achieved for the VC by clearing the local decomposition cache. It would be possible
- // to also do this for the VOC cache, but that VOCs exist exactly expresss that the object
+ // to also do this for the VOC cache, but that VOCs exist exactly express that the object
// gets visualised, so this would be wrong.
flushViewIndependentPrimitive2DSequence();
}
@@ -380,7 +380,7 @@ namespace sdr
{
// #i102380# The graphic is swapped out. To not force a swap-in here, there is a mechanism
// which shows a swapped-out-visualisation (which gets created here now) and an asynchronious
- // visual update mechanism for swapped-out grapgics when they were loaded (see AsynchGraphicLoadingEvent
+ // visual update mechanism for swapped-out graphics when they were loaded (see AsynchGraphicLoadingEvent
// and ViewObjectContactOfGraphic implementation). Not forcing the swap-in here allows faster
// (non-blocking) processing here and thus in the effect e.g. fast scrolling through pages
xRetval = createVIP2DSForDraft(aObjectMatrix, aAttribute);
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 4b6f58c..d620346 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -105,7 +105,7 @@ namespace sdr
drawinglayer::primitive2d::Primitive2DSequence xRetval;
const SfxItemSet& rItemSet = GetCustomShapeObj().GetMergedItemSet();
- // #i98072# Get shandow and text; eventually suppress the text if it's
+ // #i98072# Get shadow and text; eventually suppress the text if it's
// a TextPath FontworkGallery object
const drawinglayer::attribute::SdrShadowTextAttribute aAttribute(
drawinglayer::primitive2d::createNewSdrShadowTextAttribute(
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index 7bb3e74..bdbe9ce 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -98,7 +98,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createPr
if(GetOle2Obj().IsChart())
{
// #i123539# allow buffering and reuse of local chart data to not need to rebuild it
- // on every ViewObjectContact::getPrimitive2DSequence call. TTTT: No tneeded for
+ // on every ViewObjectContact::getPrimitive2DSequence call. TTTT: Not needed for
// aw080, there this mechanism alraedy works differently
if(mxChartContent.is())
{
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index 664f5b1..af43691 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -314,7 +314,7 @@ void ViewObjectContact::checkForPrimitive2DAnimations()
if(aAnimatedExtractor.getPrimitive2DSequence().hasElements())
{
- // dervied primitiveList is animated, setup new PrimitiveAnimation
+ // derived primitiveList is animated, setup new PrimitiveAnimation
mpPrimitiveAnimation = new sdr::animation::PrimitiveAnimation(*this, aAnimatedExtractor.getPrimitive2DSequence());
}
}
diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
index 7a65548..8e8e24f 100644
--- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
@@ -38,7 +38,7 @@ using namespace com::sun::star;
namespace
{
// Helper method to recursively travel the DrawHierarchy for 3D objects contained in
- // the 2D Scene. This will chreate all VOCs for the currenbt OC which are needed
+ // the 2D Scene. This will create all VOCs for the current OC which are needed
// for ActionChanged() functionality
void impInternalSubHierarchyTraveller(const sdr::contact::ViewObjectContact& rVOC)
{
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index ebca769..7b26f00 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -234,7 +234,7 @@ namespace sdr
if(mpAsynchLoadEvent)
{
OSL_ENSURE(!pEvent || mpAsynchLoadEvent == pEvent,
- "ViewObjectContactOfGraphic::forgetAsynchGraphicLoadingEvent: Forced to forget another event then i have scheduled (?)");
+ "ViewObjectContactOfGraphic::forgetAsynchGraphicLoadingEvent: Forced to forget another event then I have scheduled (?)");
// forget event
mpAsynchLoadEvent = 0;
More information about the Libreoffice-commits
mailing list