[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sfx2/source

[Michael Meeks]

 sfx2/source/doc/docfile.cxx  |   11 ++++++-----
 sfx2/source/doc/oleprops.cxx |    2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 5dd688864821845afb48d093a90be2df9b4dafc5
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Jul 11 12:05:47 2011 +0100

    fdo#36733: Add useronly read permission, while creating tmpfile.
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 6c09670..e6e9620 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3330,11 +3330,12 @@ sal_Bool SfxMedium::SetWritableForUserOnly( const ::rtl::OUString& aURL )
         {
             sal_uInt64 nAttributes = aFileStatus.getAttributes();
 
-            nAttributes &= ~(Attribute_OwnWrite |
-                             Attribute_GrpWrite |
-                             Attribute_OthWrite |
-                             Attribute_ReadOnly);
-            nAttributes |= Attribute_OwnWrite;
+            nAttributes &= ~(osl_File_Attribute_OwnWrite |
+                             osl_File_Attribute_GrpWrite |
+                             osl_File_Attribute_OthWrite |
+                             osl_File_Attribute_ReadOnly);
+            nAttributes |=  (osl_File_Attribute_OwnWrite |
+                             osl_File_Attribute_OwnRead);
 
             bResult = ( osl::File::setAttributes( aURL, nAttributes ) == ::osl::FileBase::E_None );
         }
commit b44017797dc8060b497a521e7c42a6a6e81bd32f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 4 09:27:39 2011 +0100

    Related: #i35066# ole props buglet
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>

diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 7f4b8bc..3dd6f37 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -1156,7 +1156,7 @@ void SfxOlePropertySet::ImplLoad( SvStream& rStrm )
     sal_uInt16 nOsMinor;
     sal_uInt16 nOsType;
     SvGlobalName aGuid;
-    sal_Int32 nSectCount;
+    sal_Int32 nSectCount(0);
     rStrm >> nByteOrder >> nVersion >> nOsMinor >> nOsType >> aGuid >> nSectCount;
 
     // read sections