Tag: cws_src680_dba26 User: fs Date: 05/03/17 07:19:40 Modified: /dba/dbaccess/source/filter/migration/ cfgimport.cxx
Log: #i44419# also work correctly for the case that a bookmarked document does not exist 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.5.14.2&r2=1.5.14.3 Delta lines: +14 -12 --------------------- --- cfgimport.cxx 14 Mar 2005 14:17:30 -0000 1.5.14.2 +++ cfgimport.cxx 17 Mar 2005 15:19:37 -0000 1.5.14.3 @@ -2,9 +2,9 @@ * * $RCSfile: cfgimport.cxx,v $ * - * $Revision: 1.5.14.2 $ + * $Revision: 1.5.14.3 $ * - * last change: $Author: fs $ $Date: 2005/03/14 14:17:30 $ + * last change: $Author: fs $ $Date: 2005/03/17 15:19:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -830,11 +830,15 @@ { if ( !m_aStack.empty() ) { - switch(m_aStack.top().second) + sal_Int16 nElementType = m_aStack.top().second; + ::rtl::OUString sName = m_aStack.top().first; + m_aStack.pop(); + + switch(nElementType) { case DATASOURCE: { - setProperties(m_aStack.top().second); + setProperties(nElementType); Reference<XStorable> xStr(m_xModel,UNO_QUERY); if ( xStr.is() ) { @@ -872,7 +876,7 @@ break; case TABLE: { - setProperties(m_aStack.top().second); + setProperties(nElementType); Reference<XTablesSupplier> xSupplier(m_xCurrentDS,UNO_QUERY); Reference<XNameContainer> xTables(xSupplier->getTables(),UNO_QUERY); ::rtl::OUString sName; @@ -884,10 +888,10 @@ break; case QUERY: { - setProperties(m_aStack.top().second); + setProperties(nElementType); Reference<XQueryDefinitionsSupplier> xQueriesSupplier(m_xCurrentDS,UNO_QUERY); Reference<XNameContainer> xQueries(xQueriesSupplier->getQueryDefinitions(),UNO_QUERY); - xQueries->insertByName(m_aStack.top().first,makeAny(m_xCurrentObject)); + xQueries->insertByName(sName,makeAny(m_xCurrentObject)); m_xCurrentObject = NULL; } break; @@ -895,7 +899,7 @@ try { if ( !UCBContentHelper::IsDocument(m_sDocumentLocation) ) - return; + break; sal_Bool bForm = sal_True; bForm = !isDocumentReport(m_xORB,m_sDocumentLocation); @@ -951,7 +955,7 @@ case COLUMN: if ( m_xCurrentColumn.is() ) { - setProperties(m_aStack.top().second); + setProperties(nElementType); Reference<XColumnsSupplier> xSupplier(m_xCurrentObject,UNO_QUERY); Reference<XAppend> xAppend(xSupplier->getColumns(),UNO_QUERY); if ( xAppend.is() ) @@ -960,8 +964,6 @@ } break; } - - m_aStack.pop(); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
