[Libreoffice-commits] .: sd/source

[Libreoffice Gerrit user]

 sd/source/ui/toolpanel/controls/MasterPageContainer.cxx  |   10 +++++-----
 sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 20778d72fe4c785ebe9039767afa07f35b045541
Author: Rob Snelders <programming at ertai.nl>
Date:   Fri Dec 7 23:13:06 2012 +0100

    - correct variable-names
    
    Change-Id: I2c0106d18586201f8c0fa444652ecefb493d61bf
    Reviewed-on: https://gerrit.libreoffice.org/1267
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index f17a224..c35e08b 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 fdd38c6..cdb512c 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;
 }