User: kz Date: 2006/07/19 08:58:38 Modified: dba/dbaccess/source/filter/migration/cfgimport.cxx
Log: INTEGRATION: CWS warningfixes02 (1.11.6); FILE MERGED 2006/06/30 11:53:06 sb 1.11.6.1: #i66577# Made the code compile (warning-free) on a unxlngi6.pro GCC 4.1.1 Linux box. 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.11&r2=1.12 Delta lines: +9 -9 ------------------- --- cfgimport.cxx 20 Jun 2006 02:48:36 -0000 1.11 +++ cfgimport.cxx 19 Jul 2006 15:58:35 -0000 1.12 @@ -1042,9 +1042,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 ( (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_FONT_CHARACTEREMPHASIS ) sProp = PROPERTY_TEXTEMPHASIS; else if ( aName == CONFIGKEY_DEFSET_FONT_CHARACTERRELIEF ) sProp = PROPERTY_TEXTRELIEF; // font @@ -1080,13 +1080,13 @@ { ::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; + 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; + 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 ( sProp.getLength() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
