- correct variable-names
Change-Id: I2c0106d18586201f8c0fa444652ecefb493d61bf Reviewed-on: https://gerrit.libreoffice.org/1267 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
parent
217ba33cb0
commit
20778d72fe
2 changed files with 8 additions and 8 deletions
|
@ -1159,18 +1159,18 @@ bool MasterPageContainer::Implementation::UpdateDescriptor (
|
|||
// Update the page object (which may be used for the preview update).
|
||||
if (bForcePageObject)
|
||||
GetDocument();
|
||||
int bPageObjectModified (rpDescriptor->UpdatePageObject(
|
||||
int nPageObjectModified (rpDescriptor->UpdatePageObject(
|
||||
(bForcePageObject ? -1 : nCostThreshold),
|
||||
mpDocument));
|
||||
if (bPageObjectModified == 1 && bSendEvents)
|
||||
if (nPageObjectModified == 1 && bSendEvents)
|
||||
FireContainerChange(
|
||||
MasterPageContainerChangeEvent::DATA_CHANGED,
|
||||
rpDescriptor->maToken);
|
||||
if (bPageObjectModified == -1 && bSendEvents)
|
||||
if (nPageObjectModified == -1 && bSendEvents)
|
||||
FireContainerChange(
|
||||
MasterPageContainerChangeEvent::CHILD_REMOVED,
|
||||
rpDescriptor->maToken);
|
||||
if (bPageObjectModified && ! mbFirstPageObjectSeen)
|
||||
if (nPageObjectModified && ! mbFirstPageObjectSeen)
|
||||
UpdatePreviewSizePixel();
|
||||
|
||||
// Update the preview.
|
||||
|
@ -1185,7 +1185,7 @@ bool MasterPageContainer::Implementation::UpdateDescriptor (
|
|||
MasterPageContainerChangeEvent::PREVIEW_CHANGED,
|
||||
rpDescriptor->maToken);
|
||||
|
||||
return bPageObjectModified || bPreviewModified;
|
||||
return nPageObjectModified || bPreviewModified;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -181,7 +181,7 @@ int MasterPageDescriptor::UpdatePageObject (
|
|||
sal_Int32 nCostThreshold,
|
||||
SdDrawDocument* pDocument)
|
||||
{
|
||||
int bModified = 0;
|
||||
int nModified = 0;
|
||||
|
||||
// Update the page object when that is not yet known.
|
||||
if (mpMasterPage == NULL
|
||||
|
@ -224,10 +224,10 @@ int MasterPageDescriptor::UpdatePageObject (
|
|||
return -1;
|
||||
}
|
||||
|
||||
bModified = 1;
|
||||
nModified = 1;
|
||||
}
|
||||
|
||||
return bModified;
|
||||
return nModified;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue