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

Alex Ivan alexnivan at yahoo.com
Fri May 3 03:26:39 PDT 2013


 framework/source/uiconfiguration/uiconfigurationmanager.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit da06166015689eca260c702602bef4cea58afbd3
Author: Alex Ivan <alexnivan at yahoo.com>
Date:   Mon Apr 15 18:56:10 2013 +0300

    fix bug #60700 - de-crutify ODF files
    
    Initialization of storage elements in Configuration folder is now
    done in read-only mode. Modification does not affect these folders
    in case of actual storage within them.
    Only tested for example posted on bugzilla page.
    
    Added open mode directly into function call.
    
    Change-Id: Ib2b4ae1f4cab35f2c9cd1fc7081302e1231da7a4
    Reviewed-on: https://gerrit.libreoffice.org/3401
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index a2469e0..c32e2d9 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -540,8 +540,6 @@ void UIConfigurationManager::impl_Initialize()
     // Initialize the top-level structures with the storage data
     if ( m_xDocConfigStorage.is() )
     {
-        long nModes = m_bReadOnly ? ElementModes::READ : ElementModes::READWRITE;
-
         // Try to access our module sub folder
         for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT;
               i++ )
@@ -549,7 +547,7 @@ void UIConfigurationManager::impl_Initialize()
             Reference< XStorage > xElementTypeStorage;
             try
             {
-                xElementTypeStorage = m_xDocConfigStorage->openStorageElement( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes );
+                xElementTypeStorage = m_xDocConfigStorage->openStorageElement( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READ );
             }
             catch ( const com::sun::star::container::NoSuchElementException& )
             {


More information about the Libreoffice-commits mailing list