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

Andras Timar andras.timar at collabora.com
Mon Nov 18 04:19:04 PST 2013


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

New commits:
commit d4fa4c7b386157a7b313bacda0aa0b09ff40f5af
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.

diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 3b264d9..bbfc282 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -513,6 +513,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++ )
@@ -520,7 +522,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& )
             {


More information about the Libreoffice-commits mailing list