[Libreoffice-commits] core.git: sd/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jul 29 09:14:50 UTC 2019
sd/source/core/CustomAnimationEffect.cxx | 2 -
sd/source/core/sdpage.cxx | 6 +--
sd/source/core/stlsheet.cxx | 2 -
sd/source/filter/eppt/epptso.cxx | 2 -
sd/source/filter/eppt/pptexanimations.cxx | 2 -
sd/source/filter/eppt/pptx-animations.cxx | 2 -
sd/source/filter/html/htmlex.cxx | 16 +++++-----
sd/source/filter/ppt/ppt97animations.cxx | 2 -
sd/source/filter/ppt/pptinanimations.cxx | 2 -
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 4 +-
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2 -
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2 -
sd/source/ui/animations/CustomAnimationList.cxx | 2 -
sd/source/ui/dlg/TemplateScanner.cxx | 2 -
sd/source/ui/dlg/animobjs.cxx | 8 ++---
sd/source/ui/dlg/brkdlg.cxx | 2 -
sd/source/ui/dlg/sdtreelb.cxx | 4 +-
sd/source/ui/framework/configuration/ResourceFactoryManager.cxx | 2 -
sd/source/ui/framework/factories/ChildWindowPane.cxx | 2 -
19 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit a5dabf94fa32fb397141b7aee8e3daecb0240dc4
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Jul 29 09:17:58 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Jul 29 11:14:02 2019 +0200
Fix typos
Change-Id: I11e3dc250c140b03bbc2d2d83a448e40a1624fe3
Reviewed-on: https://gerrit.libreoffice.org/76519
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Jenkins
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index b5f96d8ff7cf..4054aa6686a0 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2397,7 +2397,7 @@ EffectSequenceHelper::createTextGroup(const CustomAnimationEffectPtr& pEffect,
sal_Int32 nTextGrouping, double fTextGroupingAuto,
bool bAnimateForm, bool bTextReverse)
{
- // first finde a free group-id
+ // first find a free group-id
sal_Int32 nGroupId = 0;
CustomAnimationTextGroupMap::iterator aIter( maGroupMap.begin() );
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 594c2dfec7f0..a478c59ada7d 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1192,7 +1192,7 @@ void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind)
/**************************************************************************
|*
-|* assign a AutoLayout
+|* assign an AutoLayout
|*
\*************************************************************************/
@@ -2308,7 +2308,7 @@ SdrObject* SdPage::InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind,
/*************************************************************************
|*
-|* Returns the PresObjKind of a object
+|* Returns the PresObjKind of an object
|*
\************************************************************************/
@@ -2356,7 +2356,7 @@ void SdPage::InsertPresObj(SdrObject* pObj, PresObjKind eKind )
/*************************************************************************
|*
-|* Set the text of a object
+|* Set the text of an object
|*
\************************************************************************/
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index d49806b8b058..5089006b8e8b 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -1217,7 +1217,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN
break;
}
- // if a item is set, this doesn't mean we want it :)
+ // if an item is set, this doesn't mean we want it :)
if( PropertyState_DIRECT_VALUE == eState )
{
switch( pEntry->nWID )
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index d477bb2655c4..23d66a559a07 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -889,7 +889,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
}
nCharColor |= 0xfe000000;
if ( nInstance == 4 ) // special handling for normal textobjects:
- nPropertyFlags |= nCharAttr & 0x217; // not all attributes ar inherited
+ nPropertyFlags |= nCharAttr & 0x217; // not all attributes are inherited
else
{
if ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, CharAttr_Bold, nCharAttr ) )
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 6740b79174b2..ba66d67f71d1 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -423,7 +423,7 @@ bool AnimationExporter::hasAfterEffectNode( const Reference< XAnimationNode >& x
}
// check if this group only contain empty groups. this may happen when
-// after effect nodes are not exported at theire original position
+// after effect nodes are not exported at their original position
bool AnimationExporter::isEmptyNode( const Reference< XAnimationNode >& xNode ) const
{
if( xNode.is() ) switch( xNode->getType() )
diff --git a/sd/source/filter/eppt/pptx-animations.cxx b/sd/source/filter/eppt/pptx-animations.cxx
index cdd1bbdd6d5a..9c930d768bbc 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -542,7 +542,7 @@ class NodeContext
OUString msEffectPresetId;
OUString msEffectPresetSubType;
- /// constructor helper for initializing user datas.
+ /// constructor helper for initializing user data.
void initUserData();
/// constructor helper to initialize maChildNodes.
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 7b7bb2f9d1bb..c5a197e1f1fb 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1171,7 +1171,7 @@ bool HtmlExport::WriteHtml( const OUString& rFileName, bool bAddExtension, const
return nErr == ERRCODE_NONE;
}
-/** creates a outliner text for the title objects of a page
+/** creates an outliner text for the title objects of a page
*/
OUString HtmlExport::CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor )
{
@@ -1193,7 +1193,7 @@ OUString HtmlExport::CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage,
return OUString();
}
-// creates a outliner text for a page
+// creates an outliner text for a page
OUString HtmlExport::CreateTextForPage(SdrOutliner* pOutliner, SdPage const * pPage,
bool bHeadLine, const Color& rBackgroundColor)
{
@@ -1362,7 +1362,7 @@ void HtmlExport::WriteOutlinerParagraph(OUStringBuffer& aStr, SdrOutliner* pOutl
pOutliner->Clear();
}
-// creates a outliner text for a note page
+// creates an outliner text for a note page
OUString HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner,
SdPage* pPage,
const Color& rBackgroundColor )
@@ -1691,7 +1691,7 @@ bool HtmlExport::CreateHtmlForPresPages()
/**
insert areas into Imagemap of the object, if the object has
- such a Imagemap
+ such an Imagemap
*/
if (pIMapInfo)
{
@@ -1711,7 +1711,7 @@ bool HtmlExport::CreateHtmlForPresPages()
if (nPgNum == SDRPAGE_NOTFOUND)
{
- // is the bookmark a object?
+ // is the bookmark an object?
pObj = mpDoc->GetObj( aURL );
if (pObj)
nPgNum = pObj->getSdrPageFromSdrObject()->GetPageNum();
@@ -1797,7 +1797,7 @@ bool HtmlExport::CreateHtmlForPresPages()
if( nPgNum == SDRPAGE_NOTFOUND )
{
- // is the bookmark a object?
+ // is the bookmark an object?
pObj = mpDoc->GetObj(pInfo->GetBookmark());
if (pObj)
nPgNum = pObj->getSdrPageFromSdrObject()->GetPageNum();
@@ -2713,7 +2713,7 @@ OUString HtmlExport::CreateLink( const OUString& aLink,
return aStr.makeStringAndClear();
}
-// creates a image tag
+// creates an image tag
OUString HtmlExport::CreateImage( const OUString& aImage, const OUString& aAltText )
{
OUStringBuffer aStr( "<img src=\"");
@@ -2828,7 +2828,7 @@ OUString HtmlExport::StringToHTMLString( const OUString& rString )
return OUString( static_cast<char const *>(aMemStm.GetData()), nLength, RTL_TEXTENCODING_UTF8 );
}
-// creates a url for a specific page
+// creates a URL for a specific page
OUString HtmlExport::CreatePageURL( sal_uInt16 nPgNum )
{
if(mbFrames)
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index c2ec7c1bb4b6..c26523c332cc 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -165,7 +165,7 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate )
//the appear effect cannot be animated without text
if( GetPresetId() == "ooo-entrance-appear" )
return;
- //the random effect may be the appear effect and than has the same problem
+ //the random effect may be the appear effect and then has the same problem
if( GetPresetId() == "ooo-entrance-random" )
{
//this case is not 100% correct -> feel free to complete
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 64b87265744c..b9eb1697375e 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -548,7 +548,7 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >&
}
}
- // check for after-affect
+ // check for after-effect
Sequence< NamedValue > aUserData( xNode->getUserData() );
NamedValue* pValue = aUserData.getArray();
NamedValue* pLastValue = pValue;
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 96c922cf41ac..124cd984826e 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -165,7 +165,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener,
{
case VclEventId::ObjectDying:
{
- // Window is dying. Unregister from VCL Window.
+ // Window is dying. Unregister from VCL Window.
// This is also attempted in the disposing() method.
vcl::Window* pWindow = maShapeTreeInfo.GetWindow();
vcl::Window* pDyingWindow = rEvent.GetWindow();
@@ -459,7 +459,7 @@ void AccessibleDocumentViewBase::impl_dispose()
mxWindow = nullptr;
}
- // Unregister form the model.
+ // Unregister from the model.
if (mxModel.is())
mxModel->removeEventListener (
static_cast<awt::XWindowListener*>(this));
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 1e02117aa0ba..f40561ff3eb3 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -124,7 +124,7 @@ void AccessibleDrawDocumentView::ViewForwarderChanged()
}
/** The page shape is created on every call at the moment (provided that
- every thing goes well).
+ everything goes well).
*/
rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageShape()
{
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 7de687968089..7a0a4fc43a63 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -662,7 +662,7 @@ void AccessibleSlideSorterView::Implementation::RequestUpdateChildren()
void AccessibleSlideSorterView::Implementation::UpdateChildren()
{
//By default, all children should be accessible. So here workaround is to make all children visible.
- // MT: THis was in UpdateVisibility, which has some similarity, and hg merge automatically has put it here. Correct?!
+ // MT: This was in UpdateVisibility, which has some similarity, and hg merge automatically has put it here. Correct?!
// In the IA2 CWS, also setting mnFirst/LastVisibleChild was commented out!
mnLastVisibleChild = maPageObjects.size();
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index c0b2086abac7..4eb984ba370e 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -480,7 +480,7 @@ void CustomAnimationList::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
}
}
- // Allow normal proccessing; this calls our NotifyStartDrag().
+ // Allow normal processing; this calls our NotifyStartDrag().
SvTreeListBox::StartDrag( nAction, rPosPixel );
}
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index f1f250f046fa..a467795a9331 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -223,7 +223,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning()
aProps[0] = TITLE;
aProps[1] = "TargetDirURL";
- // Create an cursor to iterate over the template folders.
+ // Create a cursor to iterate over the template folders.
mxFolderResultSet.set( aTemplateDir.createCursor(aProps, ::ucbhelper::INCLUDE_FOLDERS_ONLY));
if (mxFolderResultSet.is())
eNextState = GATHER_FOLDER_LIST;
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index f4c5b32d558b..f2807c71e570 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -454,7 +454,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void )
}
}
- // can we create a animation group
+ // can we create an animation group
if (m_FrameList.empty())
{
m_pBtnCreateGroup->Disable();
@@ -586,7 +586,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
}
else
{
- // enable 'group object' only if it is not a Animated GIF
+ // enable 'group object' only if it is not an Animated GIF
if (m_FrameList.empty())
{
m_pRbtGroup->Enable();
@@ -748,7 +748,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
// increment => next one inserted after this one
++m_nCurrentFrame;
}
- // if a animated GIF is taken, only such one can be created
+ // if an animated GIF is taken, only such one can be created
m_pRbtBitmap->Check();
m_pRbtGroup->Enable( false );
bAnimObj = true;
@@ -849,7 +849,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
}
// if there was nothing in the animator before but now is something
- // there, we can create a animation group
+ // there, we can create an animation group
if (nCloneCount == 0 && !m_FrameList.empty())
{
m_pBtnCreateGroup->Enable();
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index f0c14e065f2c..81a0251ea819 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -76,7 +76,7 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool )
if (!m_xProgrInfo)
return true;
- // update status bar or show a error message?
+ // update status bar or show an error message?
if(nInit == reinterpret_cast<void*>(1))
{
std::unique_ptr<weld::MessageDialog> xErrBox(Application::CreateMessageDialog(m_xDialog.get(),
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index b17fb4546524..e2707d03928c 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -357,7 +357,7 @@ OUString SdPageObjsTLB::GetObjectName(
}
/**
- * select a entry in TreeLB
+ * select an entry in TreeLB
*/
bool SdPageObjsTLB::SelectEntry( const OUString& rName )
{
@@ -1759,7 +1759,7 @@ void SdPageObjsTLV::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium,
}
/**
- * select a entry in TreeLB
+ * select an entry in TreeLB
*/
bool SdPageObjsTLV::SelectEntry( const OUString& rName )
{
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
index d92e60455103..e0a98ad288d6 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
@@ -77,7 +77,7 @@ void ResourceFactoryManager::AddFactory (
if (rsURL.indexOf('*') >= 0 || rsURL.indexOf('?') >= 0)
{
- // The URL is a URL pattern not an single URL.
+ // The URL is a URL pattern not a single URL.
maFactoryPatternList.emplace_back(rsURL, rxFactory);
#if defined VERBOSE && VERBOSE>=1
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index 83bc87af3dd9..fc5040b2c1b3 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -130,7 +130,7 @@ vcl::Window* ChildWindowPane::GetWindow()
// shell has already been activated. The activation is not
// necessary for the code to work properly but is used to optimize
// the layouting and displaying of the window. When it is made
- // visible to early then some layouting seems to be made twice or at
+ // visible too early then some layouting seems to be made twice or at
// an inconvenient time and the overall process of initializing the
// Impress takes longer.
if (!mbHasBeenActivated && mpShell != nullptr && !mpShell->IsActive())
More information about the Libreoffice-commits
mailing list