[Libreoffice-commits] core.git: include/filter sc/source sd/source svl/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Tue Apr 23 07:20:51 UTC 2019
include/filter/msfilter/svdfppt.hxx | 2 +-
sc/source/ui/inc/acredlin.hxx | 4 ++--
sc/source/ui/miscdlgs/acredlin.cxx | 8 ++++----
sd/source/filter/eppt/epptbase.hxx | 2 +-
sd/source/filter/eppt/pptx-epptbase.cxx | 4 ++--
sd/source/filter/ppt/pptin.cxx | 2 +-
svl/source/items/itempool.cxx | 6 +++---
7 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 30eb1ba084468c15bb4dd3bba44c2668ddc94aad
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Apr 22 11:33:56 2019 +0000
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Apr 23 09:20:00 2019 +0200
Fix typos in code
Change-Id: I5a39d89ad33d447f952d6c4c32923d387c47fd06
Reviewed-on: https://gerrit.libreoffice.org/71083
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 66be39501c79..b55458f94f6e 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -1443,7 +1443,7 @@ enum class PptSlideLayout
TOPROW2COLUMN = 13, // Body contains 2 rows, top row has 2 columns
FOUROBJECTS = 14, // 4 objects
BIGOBJECT = 15, // Big object
- BLANCSLIDE = 16, // Blank slide
+ BLANKSLIDE = 16, // Blank slide
TITLERIGHTBODYLEFT = 17, // Vertical title on the right, body on the left
TITLERIGHT2BODIESLEFT = 18 // Vertical title on the right, body on the left split into 2 rows
};
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 955a11be5983..fd8e19f8f24f 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -135,8 +135,8 @@ class ScAcceptChgDlg final : public SfxModelessDialog
void AppendChanges(const ScChangeTrack* pChanges,sal_uLong nStartAction, sal_uLong nEndAction);
- void RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction);
- void UpdateEntrys(const ScChangeTrack* pChgTrack, sal_uLong nStartAction,sal_uLong nEndAction);
+ void RemoveEntries(sal_uLong nStartAction,sal_uLong nEndAction);
+ void UpdateEntries(const ScChangeTrack* pChgTrack, sal_uLong nStartAction,sal_uLong nEndAction);
void UpdateView();
void ClearView();
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 3ce5f96c3653..3e39243c5210 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1437,7 +1437,7 @@ void ScAcceptChgDlg::AppendChanges(const ScChangeTrack* pChanges,sal_uLong nStar
}
}
-void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction)
+void ScAcceptChgDlg::RemoveEntries(sal_uLong nStartAction,sal_uLong nEndAction)
{
pTheView->SetUpdateMode(false);
@@ -1481,7 +1481,7 @@ void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction)
}
-void ScAcceptChgDlg::UpdateEntrys(const ScChangeTrack* pChgTrack, sal_uLong nStartAction,sal_uLong nEndAction)
+void ScAcceptChgDlg::UpdateEntries(const ScChangeTrack* pChgTrack, sal_uLong nStartAction,sal_uLong nEndAction)
{
pTheView->SetUpdateMode(false);
@@ -1556,11 +1556,11 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void)
AppendChanges(&rChgTrack,nStartAction,nEndAction);
break;
case ScChangeTrackMsgType::Remove:
- RemoveEntrys(nStartAction,nEndAction);
+ RemoveEntries(nStartAction,nEndAction);
break;
case ScChangeTrackMsgType::Parent:
case ScChangeTrackMsgType::Change: //bNeedsUpdate=true;
- UpdateEntrys(&rChgTrack,nStartAction,nEndAction);
+ UpdateEntries(&rChgTrack,nStartAction,nEndAction);
break;
default: assert(false); break;
}
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 2884953d77bb..39598f2780bc 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -69,7 +69,7 @@ enum class EppLayout
TOPROW2COLUMN = 13, /* Body contains 2 rows, top row has 2 columns */
FOUROBJECTS = 14, /* 4 objects */
BIGOBJECT = 15, /* Big object */
- BLANCSLIDE = 16, /* Blank slide */
+ BLANKSLIDE = 16, /* Blank slide */
TITLERIGHTBODYLEFT = 17, /* Vertical title on the right, body on the left */
TITLERIGHT2BODIESLEFT = 18 /* Vertical title on the right, body on the left split into 2 rows */
};
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 83cabbd88a74..0c10c2bada54 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -74,7 +74,7 @@ static PHLayout const pPHLayout[] =
{ EppLayout::TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, true, true, false },
{ EppLayout::TWOCOLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, true, true, true },
{ EppLayout::TWOCOLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, true, true, false },
- { EppLayout::BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, false, false, false },
+ { EppLayout::BLANKSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, false, false, false },
{ EppLayout::TWOCOLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, true, true, false },
{ EppLayout::TWOCOLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, true, true, false },
{ EppLayout::TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, true, false, false },
@@ -89,7 +89,7 @@ static PHLayout const pPHLayout[] =
{ EppLayout::TWOROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false },
{ EppLayout::FOUROBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, false, false },
{ EppLayout::ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, true, false, false },
- { EppLayout::BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, false, false, false },
+ { EppLayout::BLANKSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, false, false, false },
{ EppLayout::TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, true, true, false },
{ EppLayout::TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, true, true, false },
{ EppLayout::TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, true, true, false },
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 0c60e860bcfa..ff513074f61a 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1167,7 +1167,7 @@ bool ImplSdPPTImport::Import()
break;
case PptSlideLayout::BOTTOMROW2COLUMNS :
- case PptSlideLayout::BLANCSLIDE :
+ case PptSlideLayout::BLANKSLIDE :
case PptSlideLayout::MASTERSLIDE : // layout of the standard and title master page
case PptSlideLayout::TITLEMASTERSLIDE :
case PptSlideLayout::MASTERNOTES : // layout of the note master page
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index bb3ac17f417b..406b4a3db785 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -626,7 +626,7 @@ const SfxPoolItem& SfxItemPool::PutImpl( const SfxPoolItem& rItem, sal_uInt16 nW
if (it != rItemArr.end())
{
AddRef(rItem);
- assert(!bPassingOwnership && "cant be passing ownership and have the item already in the pool");
+ assert(!bPassingOwnership && "can't be passing ownership and have the item already in the pool");
return rItem;
}
}
@@ -651,7 +651,7 @@ const SfxPoolItem& SfxItemPool::PutImpl( const SfxPoolItem& rItem, sal_uInt16 nW
if (**itr == rItem)
{
AddRef(**itr);
- assert(!bPassingOwnership && "cant be passing ownership and have the item already in the pool");
+ assert(!bPassingOwnership && "can't be passing ownership and have the item already in the pool");
return **itr;
}
}
@@ -662,7 +662,7 @@ const SfxPoolItem& SfxItemPool::PutImpl( const SfxPoolItem& rItem, sal_uInt16 nW
SfxPoolItem* pNewItem;
if (bPassingOwnership)
{
- assert(!dynamic_cast<const SfxItemSet*>(&rItem) && "cant pass ownership of SfxItem, they need to be cloned to the master pool");
+ assert(!dynamic_cast<const SfxItemSet*>(&rItem) && "can't pass ownership of SfxItem, they need to be cloned to the master pool");
pNewItem = const_cast<SfxPoolItem*>(&rItem);
}
else
More information about the Libreoffice-commits
mailing list