[Libreoffice-commits] .: 2 commits - sw/source vcl/source

[Libreoffice Gerrit user]

 sw/source/core/unocore/unotext.cxx |    2 --
 vcl/source/gdi/temporaryfonts.cxx  |   18 ++++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b53472db03241a0dd45593a993ec56504ce8e3d8
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Sep 19 15:22:26 2012 +0200

    do not use invalid Directory instance (OSL_ASSERT about a NULL pointer)
    
    Change-Id: Icc1dffc9b63453575ab927a3bdfa4b25cecfe8f2

diff --git a/vcl/source/gdi/temporaryfonts.cxx b/vcl/source/gdi/temporaryfonts.cxx
index e74ea18..292e09e 100644
--- a/vcl/source/gdi/temporaryfonts.cxx
+++ b/vcl/source/gdi/temporaryfonts.cxx
@@ -20,15 +20,17 @@ void TemporaryFonts::clear()
     rtl::Bootstrap::expandMacros( path );
     path += "/user/temp/fonts/";
     osl::Directory dir( path );
-    dir.reset();
-    for(;;)
+    if( dir.reset() == osl::Directory::E_None )
     {
-        osl::DirectoryItem item;
-        if( dir.getNextItem( item ) != osl::Directory::E_None )
-            break;
-        osl::FileStatus status( osl_FileStatus_Mask_FileURL );
-        if( item.getFileStatus( status ) == osl::File::E_None )
-            osl::File::remove( status.getFileURL());
+        for(;;)
+        {
+            osl::DirectoryItem item;
+            if( dir.getNextItem( item ) != osl::Directory::E_None )
+                break;
+            osl::FileStatus status( osl_FileStatus_Mask_FileURL );
+            if( item.getFileStatus( status ) == osl::File::E_None )
+                osl::File::remove( status.getFileURL());
+        }
     }
 }
 
commit d6203d8d92b9ce63c07f932dde7c40928bea5f38
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Sep 18 18:11:22 2012 +0200

    remove apparently unused variables
    
    Change-Id: Ia3f971b065bf0fba361871cbed63833d76b462fe

diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 8872b00..3a3ba67 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1651,8 +1651,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
     }
 
     // make a selection from aStartPam to a EndPam
-    SwSelBoxes aBoxes;
-    SfxItemSet aFrameItemSet(m_pImpl->m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1);
     // If there is no content in the frame the shape is in
     // it gets deleted in the DelFullPara call below,
     // In this case insert a tmp text node ( we delete it later )