Kaydet (Commit) 30eb1ba0 authored tarafından Andrea Gelmini's avatar Andrea Gelmini Kaydeden (comit) Julien Nabet

Fix typos in code

Change-Id: I5a39d89ad33d447f952d6c4c32923d387c47fd06
Reviewed-on: https://gerrit.libreoffice.org/71083
Tested-by: Jenkins
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 0d28abe0
...@@ -1443,7 +1443,7 @@ enum class PptSlideLayout ...@@ -1443,7 +1443,7 @@ enum class PptSlideLayout
TOPROW2COLUMN = 13, // Body contains 2 rows, top row has 2 columns TOPROW2COLUMN = 13, // Body contains 2 rows, top row has 2 columns
FOUROBJECTS = 14, // 4 objects FOUROBJECTS = 14, // 4 objects
BIGOBJECT = 15, // Big object BIGOBJECT = 15, // Big object
BLANCSLIDE = 16, // Blank slide BLANKSLIDE = 16, // Blank slide
TITLERIGHTBODYLEFT = 17, // Vertical title on the right, body on the left 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 TITLERIGHT2BODIESLEFT = 18 // Vertical title on the right, body on the left split into 2 rows
}; };
......
...@@ -135,8 +135,8 @@ class ScAcceptChgDlg final : public SfxModelessDialog ...@@ -135,8 +135,8 @@ class ScAcceptChgDlg final : public SfxModelessDialog
void AppendChanges(const ScChangeTrack* pChanges,sal_uLong nStartAction, sal_uLong nEndAction); void AppendChanges(const ScChangeTrack* pChanges,sal_uLong nStartAction, sal_uLong nEndAction);
void RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction); void RemoveEntries(sal_uLong nStartAction,sal_uLong nEndAction);
void UpdateEntrys(const ScChangeTrack* pChgTrack, sal_uLong nStartAction,sal_uLong nEndAction); void UpdateEntries(const ScChangeTrack* pChgTrack, sal_uLong nStartAction,sal_uLong nEndAction);
void UpdateView(); void UpdateView();
void ClearView(); void ClearView();
......
...@@ -1437,7 +1437,7 @@ void ScAcceptChgDlg::AppendChanges(const ScChangeTrack* pChanges,sal_uLong nStar ...@@ -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); pTheView->SetUpdateMode(false);
...@@ -1481,7 +1481,7 @@ void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction) ...@@ -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); pTheView->SetUpdateMode(false);
...@@ -1556,11 +1556,11 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void) ...@@ -1556,11 +1556,11 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void)
AppendChanges(&rChgTrack,nStartAction,nEndAction); AppendChanges(&rChgTrack,nStartAction,nEndAction);
break; break;
case ScChangeTrackMsgType::Remove: case ScChangeTrackMsgType::Remove:
RemoveEntrys(nStartAction,nEndAction); RemoveEntries(nStartAction,nEndAction);
break; break;
case ScChangeTrackMsgType::Parent: case ScChangeTrackMsgType::Parent:
case ScChangeTrackMsgType::Change: //bNeedsUpdate=true; case ScChangeTrackMsgType::Change: //bNeedsUpdate=true;
UpdateEntrys(&rChgTrack,nStartAction,nEndAction); UpdateEntries(&rChgTrack,nStartAction,nEndAction);
break; break;
default: assert(false); break; default: assert(false); break;
} }
......
...@@ -69,7 +69,7 @@ enum class EppLayout ...@@ -69,7 +69,7 @@ enum class EppLayout
TOPROW2COLUMN = 13, /* Body contains 2 rows, top row has 2 columns */ TOPROW2COLUMN = 13, /* Body contains 2 rows, top row has 2 columns */
FOUROBJECTS = 14, /* 4 objects */ FOUROBJECTS = 14, /* 4 objects */
BIGOBJECT = 15, /* Big object */ BIGOBJECT = 15, /* Big object */
BLANCSLIDE = 16, /* Blank slide */ BLANKSLIDE = 16, /* Blank slide */
TITLERIGHTBODYLEFT = 17, /* Vertical title on the right, body on the left */ 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 */ TITLERIGHT2BODIESLEFT = 18 /* Vertical title on the right, body on the left split into 2 rows */
}; };
......
...@@ -74,7 +74,7 @@ static PHLayout const pPHLayout[] = ...@@ -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::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, 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::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, 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::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 }, { EppLayout::TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, true, false, false },
...@@ -89,7 +89,7 @@ static PHLayout const pPHLayout[] = ...@@ -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::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::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::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::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::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 }, { EppLayout::TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, true, true, false },
......
...@@ -1167,7 +1167,7 @@ bool ImplSdPPTImport::Import() ...@@ -1167,7 +1167,7 @@ bool ImplSdPPTImport::Import()
break; break;
case PptSlideLayout::BOTTOMROW2COLUMNS : case PptSlideLayout::BOTTOMROW2COLUMNS :
case PptSlideLayout::BLANCSLIDE : case PptSlideLayout::BLANKSLIDE :
case PptSlideLayout::MASTERSLIDE : // layout of the standard and title master page case PptSlideLayout::MASTERSLIDE : // layout of the standard and title master page
case PptSlideLayout::TITLEMASTERSLIDE : case PptSlideLayout::TITLEMASTERSLIDE :
case PptSlideLayout::MASTERNOTES : // layout of the note master page case PptSlideLayout::MASTERNOTES : // layout of the note master page
......
...@@ -626,7 +626,7 @@ const SfxPoolItem& SfxItemPool::PutImpl( const SfxPoolItem& rItem, sal_uInt16 nW ...@@ -626,7 +626,7 @@ const SfxPoolItem& SfxItemPool::PutImpl( const SfxPoolItem& rItem, sal_uInt16 nW
if (it != rItemArr.end()) if (it != rItemArr.end())
{ {
AddRef(rItem); 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; return rItem;
} }
} }
...@@ -651,7 +651,7 @@ const SfxPoolItem& SfxItemPool::PutImpl( const SfxPoolItem& rItem, sal_uInt16 nW ...@@ -651,7 +651,7 @@ const SfxPoolItem& SfxItemPool::PutImpl( const SfxPoolItem& rItem, sal_uInt16 nW
if (**itr == rItem) if (**itr == rItem)
{ {
AddRef(**itr); 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; return **itr;
} }
} }
...@@ -662,7 +662,7 @@ const SfxPoolItem& SfxItemPool::PutImpl( const SfxPoolItem& rItem, sal_uInt16 nW ...@@ -662,7 +662,7 @@ const SfxPoolItem& SfxItemPool::PutImpl( const SfxPoolItem& rItem, sal_uInt16 nW
SfxPoolItem* pNewItem; SfxPoolItem* pNewItem;
if (bPassingOwnership) 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); pNewItem = const_cast<SfxPoolItem*>(&rItem);
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment