[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits - registry/source stoc/prj

[Jan Holesovsky]

 registry/source/keyimpl.cxx |    4 ++++
 registry/source/regimpl.cxx |    5 +++++
 stoc/prj/build.lst          |    2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 06a4fc3532794a50d9c4c3e8fd898ec16ca0004e
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Oct 12 14:31:58 2009 +0000

    CWS-TOOLING: integrate CWS fwk121_OOO320
    2009-09-30 11:20:33 +0200 mav  r276548 : #i105387# allow manifest.xml have no ODF version attribute even for ODF1.2
    2009-09-30 10:54:46 +0200 mav  r276545 : #i105387# allow manifest.xml have no ODF version attribute even for ODF1.2
    2009-09-30 10:02:12 +0200 mav  r276543 : #i105082# integrating the fix from fwk117, since it is necessary for some scenarios fixed in this cws
    2009-09-30 07:33:48 +0200 jsc  r276537 : #i105360# explicitly flush OStorageStream after write operations and OStoreFile when registry file is closed
    2009-09-29 14:15:09 +0200 jsc  r276528 : #i105360# explicitly flush OStorageStream after write operations and OStoreFile when registry file is closed
    2009-09-29 09:45:28 +0200 dr  r276507 : #i105325# set correct format while opening zip package
    2009-09-28 18:46:45 +0200 mav  r276500 : CWS-TOOLING: rebase CWS fwk121 to trunk at 276429 (milestone: DEV300:m60)

diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index ca0dc3d..6ddb9af 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -365,6 +365,7 @@ RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegVal
         return REG_SET_VALUE_FAILED;
     }
 
+    rValue.flush();
     rtl_freeMemory(pBuffer);
     return REG_NO_ERROR;
 }
@@ -423,6 +424,7 @@ RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32* pValueL
         return REG_SET_VALUE_FAILED;
     }
 
+    rValue.flush();
     rtl_freeMemory(pBuffer);
     return REG_NO_ERROR;
 }
@@ -490,6 +492,7 @@ RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValu
         return REG_SET_VALUE_FAILED;
     }
 
+    rValue.flush();
     rtl_freeMemory(pBuffer);
     return REG_NO_ERROR;
 }
@@ -557,6 +560,7 @@ RegError ORegKey::setUnicodeListValue(const OUString& valueName, sal_Unicode** p
         return REG_SET_VALUE_FAILED;
     }
 
+    rValue.flush();
     rtl_freeMemory(pBuffer);
     return REG_NO_ERROR;
 }
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index a542bbe..d60c4a4 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -550,6 +550,7 @@ RegError ORegistry::closeRegistry()
     if (m_file.isValid())
     {
         closeKey(m_openKeyTable[ROOT]);
+    m_file.flush();
         m_file.close();
         m_isOpen = sal_False;
         return REG_NO_ERROR;
@@ -847,6 +848,7 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName)
     {
         return REG_DELETE_KEY_FAILED;
     }
+    sFile.flush();
 
     // set flag deleted !!!
     ((ORegKey*)hOldKey)->setDeleted(sal_True);
@@ -892,6 +894,7 @@ RegError ORegistry::deleteSubkeysAndValues(ORegKey* pKey)
             {
                 return REG_DELETE_VALUE_FAILED;
             }
+        ((OStoreFile&)pKey->getStoreFile()).flush();
         }
 
         _err = rStoreDir.next(iter);
@@ -1062,6 +1065,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
     {
         return REG_VALUE_NOT_EXISTS;
     }
+    pSourceKey->getStoreFile().flush();
 
     pBuffer = (sal_uInt8*)rtl_allocateMemory(VALUE_HEADERSIZE);
 
@@ -1133,6 +1137,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
         rtl_freeMemory(pBuffer);
         return REG_INVALID_VALUE;
     }
+    rTargetFile.flush();
 
     if (rwBytes != nSize)
     {
commit a1970e4e364ff81406ddb28cd5b518dfddbd1065
Author: Rüdiger Timm <rt at openoffice.org>
Date:   Fri Oct 9 12:36:09 2009 +0000

    #i105697# Patch by pjanik: Add missing dependency to stoc/prj/build.lst.

diff --git a/stoc/prj/build.lst b/stoc/prj/build.lst
index 4748ffc..2550563 100644
--- a/stoc/prj/build.lst
+++ b/stoc/prj/build.lst
@@ -21,4 +21,4 @@ tc	stoc\source\typeconv					nmake	-	all	tc_tcv tc_stserv tc_nservice tc_inc NULL
 tc	stoc\source\javavm						nmake	-	all	tc_jvm tc_inc NULL
 tc	stoc\source\javaloader					nmake	-	all	tc_jvload tc_inc NULL
 tc  	stoc\source\uriproc                     		nmake   -   	all 	tc_uriproc tc_stserv tc_inc NULL
-tc  	stoc\util						nmake   -   	all 	tc_util tc_boot tc_stserv tc_tcv tc_uriproc tc_smgr tc_inc tc_sreg tc_defr tc_ireg tc_regtd tc_tdmng NULL
+tc  	stoc\util						nmake   -   	all 	tc_util tc_boot tc_stserv tc_tcv tc_uriproc tc_smgr tc_inc tc_sreg tc_defr tc_ireg tc_regtd tc_tdmng tc_sec NULL