[ooo-build-commit] patches/dev300

[Noel Power]

 patches/dev300/apply                           |    3 +++
 patches/dev300/fix-uiconfiguration-insert.diff |   11 +++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit aa60a68c18758ec3b4c54e1bc585f827a4abe4c4
Author: Noel Power <noel.power at novell.com>
Date:   Thu Sep 17 16:45:27 2009 +0100

    fix for inserting uiconfiguration ( menus/toolbar ) i#105154
    
    * patches/dev300/apply:
    * patches/dev300/fix-uiconfiguration-insert.diff: fixes erroneous raising of element exists exception when adding a new toolbar or menu

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2f9ab05..88066c8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -532,6 +532,9 @@ i93000.diff, i#93000, atimar
 padmin-dialog-resize.diff, i#98164, atimar
 sw-dialogs-resize.diff, i#98164, atimar
 
+# fix erroneous element exists exception while defining new toolbar/menu
+fix-uiconfiguration-insert.diff, i#105154, noelpwer
+
 [ RadioButtons ]
 forms-radio-button-group-names.diff, n#310052, i#30823, jonp
 # depends on forms-radio-button-group-names.diff,
diff --git a/patches/dev300/fix-uiconfiguration-insert.diff b/patches/dev300/fix-uiconfiguration-insert.diff
new file mode 100644
index 0000000..392a715
--- /dev/null
+++ b/patches/dev300/fix-uiconfiguration-insert.diff
@@ -0,0 +1,11 @@
+--- framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx	2009-09-15 21:10:20.000000000 +0100
++++ framework.patched/source/uiconfiguration/uiconfigurationmanagerimpl.cxx	2009-09-17 16:23:59.000000000 +0100
+@@ -1281,7 +1281,7 @@ throw ( ElementExistException, IllegalAr
+                 bInsertData   = true;
+             }
+         }
+-        if ( !pDataSettings )
++        if ( !pDataSettings || bInsertData )
+         {
+             aUIElementData.bDefault     = false;
+             if ( !m_bUseDefault )