diff options
| -rw-r--r-- | sd/source/ui/toolpanel/controls/MasterPageContainer.cxx | 10 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index f17a2245fc60..c35e08bc3555 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -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; } diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx index fdd38c68a4b2..cdb512c6cfc4 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx @@ -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; } |