summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-10-02 11:10:40 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-10-02 11:10:40 +0000
commit36a931bd7ffca530cd91c51326d9f021b5319bc6 (patch)
treeb09d5bea67e0f24c53be49eb1f0d563e5b10a5df /framework
parent2d5e9e410be4a8a96b37acdaff8a7f9b2758b1c8 (diff)
CWS-TOOLING: integrate CWS fwk118
2009-09-22 17:19:38 +0200 cd r276361 : #i105263# GetFileTypeIndex() uses a 1 based index 2009-09-22 11:10:29 +0200 cd r276351 : #i105154# Fix bad element exists exception for ui configuration
Diffstat (limited to 'framework')
-rwxr-xr-xframework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index 9b2284c0c6b8..5b67b13d8805 100755
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -1281,7 +1281,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException,
bInsertData = true;
}
}
- if ( !pDataSettings )
+ if ( !pDataSettings || bInsertData )
{
aUIElementData.bDefault = false;
if ( !m_bUseDefault )