[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - framework/source

[Andras Timar]

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

New commits:
commit 42f4261f835ad4ff7d98126cc7fb3be84dc76126
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Nov 18 12:12:49 2013 +0100

    fdo#69500: Revert "fix bug #60700 - de-crutify ODF files"
    
    This reverts commit da06166015689eca260c702602bef4cea58afbd3.
    
    Change-Id: I8f88b68a9ab7bd8c95aad90984ddca20e3ca9d13
    Reviewed-on: https://gerrit.libreoffice.org/6709
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index c32e2d9..a2469e0 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -540,6 +540,8 @@ 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++ )
@@ -547,7 +549,7 @@ void UIConfigurationManager::impl_Initialize()
             Reference< XStorage > xElementTypeStorage;
             try
             {
-                xElementTypeStorage = m_xDocConfigStorage->openStorageElement( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READ );
+                xElementTypeStorage = m_xDocConfigStorage->openStorageElement( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes );
             }
             catch ( const com::sun::star::container::NoSuchElementException& )
             {