User: obo Date: 2006/10/12 06:33:09 Modified: dba/dbaccess/source/filter/migration/cfgimport.cxx
Log: INTEGRATION: CWS sb59 (1.12.4); FILE MERGED 2006/08/29 11:44:24 sb 1.12.4.1: #i67487# Made code warning-free (wntmsci10). File Changes: Directory: /dba/dbaccess/source/filter/migration/ ================================================= File [changed]: cfgimport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/migration/cfgimport.cxx?r1=1.13&r2=1.14 Delta lines: +25 -11 --------------------- --- cfgimport.cxx 17 Sep 2006 06:44:17 -0000 1.13 +++ cfgimport.cxx 12 Oct 2006 13:33:06 -0000 1.14 @@ -903,7 +903,7 @@ if ( xNames.is() && m_sBookmarkName.getLength() ) { - ::rtl::OUString sServiceName = SERVICE_SDB_DOCUMENTDEFINITION; + ::rtl::OUString sServiceName(SERVICE_SDB_DOCUMENTDEFINITION); Sequence< Any > aArguments(3); PropertyValue aValue; // set as folder @@ -1045,9 +1045,9 @@ else if ( aName == CONFIGKEY_DEFSET_FONT_NAME ) sProp = PROPERTY_FONTNAME; else if ( aName == CONFIGKEY_DEFSET_ORDER ) sProp = PROPERTY_ORDER; else if ( aName == CONFIGKEY_DEFSET_APPLYFILTER ) sProp = PROPERTY_APPLYFILTER; - else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_DEFSET_ROW_HEIGHT)) ) sProp = PROPERTY_ROW_HEIGHT; - else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_DEFSET_TEXTCOLOR)) ) sProp = PROPERTY_TEXTCOLOR; - else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_DEFSET_FONT_UNDERLINECOLOR)) ) sProp = PROPERTY_TEXTLINECOLOR; + else if ( aName == CONFIGKEY_DEFSET_ROW_HEIGHT ) { m_bPropertyMayBeVoid = true; sProp = PROPERTY_ROW_HEIGHT; } + else if ( aName == CONFIGKEY_DEFSET_TEXTCOLOR ) { m_bPropertyMayBeVoid = true; sProp = PROPERTY_TEXTCOLOR; } + else if ( aName == CONFIGKEY_DEFSET_FONT_UNDERLINECOLOR ) { m_bPropertyMayBeVoid = true; sProp = PROPERTY_TEXTLINECOLOR; } else if ( aName == CONFIGKEY_DEFSET_FONT_CHARACTEREMPHASIS ) sProp = PROPERTY_TEXTEMPHASIS; else if ( aName == CONFIGKEY_DEFSET_FONT_CHARACTERRELIEF ) sProp = PROPERTY_TEXTRELIEF; // font @@ -1083,13 +1083,27 @@ { ::rtl::OUString sProp; m_bPropertyMayBeVoid = sal_False; - if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_ALIGNMENT)) ) sProp = PROPERTY_ALIGN; - else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_WIDTH)) ) sProp = PROPERTY_WIDTH; - else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_RELPOSITION)) ) sProp = PROPERTY_RELATIVEPOSITION; - else if ( aName == CONFIGKEY_COLUMN_HIDDEN ) sProp = PROPERTY_HIDDEN; - else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_HELPTEXT)) ) sProp = PROPERTY_HELPTEXT; - else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_CONTROLDEFAULT)) ) sProp = PROPERTY_CONTROLDEFAULT; - else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_NUMBERFORMAT)) ) sProp = PROPERTY_NUMBERFORMAT; + if ( aName == CONFIGKEY_COLUMN_ALIGNMENT ) { + m_bPropertyMayBeVoid = true; + sProp = PROPERTY_ALIGN; + } else if ( aName == CONFIGKEY_COLUMN_WIDTH ) { + m_bPropertyMayBeVoid = true; + sProp = PROPERTY_WIDTH; + } else if ( aName == CONFIGKEY_COLUMN_RELPOSITION ) { + m_bPropertyMayBeVoid = true; + sProp = PROPERTY_RELATIVEPOSITION; + } else if ( aName == CONFIGKEY_COLUMN_HIDDEN ) { + sProp = PROPERTY_HIDDEN; + } else if ( aName == CONFIGKEY_COLUMN_HELPTEXT ) { + m_bPropertyMayBeVoid = true; + sProp = PROPERTY_HELPTEXT; + } else if ( aName == CONFIGKEY_COLUMN_CONTROLDEFAULT ) { + m_bPropertyMayBeVoid = true; + sProp = PROPERTY_CONTROLDEFAULT; + } else if ( aName == CONFIGKEY_COLUMN_NUMBERFORMAT ) { + m_bPropertyMayBeVoid = true; + sProp = PROPERTY_NUMBERFORMAT; + } if ( sProp.getLength() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
