[Libreoffice-commits] core.git: sd/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 16 18:45:44 UTC 2018


 sd/source/ui/unoidl/unomodel.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e57ab1b338af12a85166859b9f5e5b958300f867
Author:     Zdibák Zoltán <zdibakzoltan at gmail.com>
AuthorDate: Sat Oct 13 14:42:12 2018 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 16 20:45:04 2018 +0200

    Narrowed variableScope
    
    Change-Id: Ic3284266a021e3fe17bf99a64e75c0d5a7e662d7
    Reviewed-on: https://gerrit.libreoffice.org/61739
    Tested-by: Jenkins
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 05d9af5ca483..898eeda69772 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -3228,8 +3228,6 @@ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawP
     if( nullptr == mpModel || mpModel->mpDoc == nullptr )
         throw lang::DisposedException();
 
-    SdDrawDocument& rDoc = *mpModel->mpDoc;
-
     SdMasterPage* pSdPage = SdMasterPage::getImplementation( xPage );
     if(pSdPage == nullptr)
         return;
@@ -3246,6 +3244,8 @@ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawP
     {
         sal_uInt16 nPage = pPage->GetPageNum();
 
+        SdDrawDocument& rDoc = *mpModel->mpDoc;
+
         SdPage* pNotesPage = static_cast< SdPage* >( rDoc.GetMasterPage( nPage+1 ) );
 
         bool bUndo = rDoc.IsUndoEnabled();


More information about the Libreoffice-commits mailing list