Tag: cws_src680_oj14 User: oj Date: 06/01/03 00:07:55 Modified: /dba/dbaccess/inc/ dbaccess_slotid.hrc /dba/dbaccess/prj/ d.lst /dba/dbaccess/source/core/api/ RowSet.cxx, RowSetCache.cxx, SingleSelectQueryComposer.cxx /dba/dbaccess/source/core/dataaccess/ ComponentDefinition.hxx, databasedocument.cxx, documentcontainer.hxx, documentdefinition.cxx /dba/dbaccess/source/core/inc/ ContentHelper.hxx, definitioncontainer.hxx /dba/dbaccess/source/filter/xml/ makefile.mk /dba/dbaccess/source/inc/ dbustrings.hrc /dba/dbaccess/source/shared/ dbustrings.cxx /dba/dbaccess/uiconfig/dbapp/menubar/ menubar.xml /dba/dbaccess/util/ makefile.mk
Log: export controller class File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: dbaccess_slotid.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/dbaccess_slotid.hrc?r1=1.7&r2=1.7.8.1 Delta lines: +4 -3 ------------------- --- dbaccess_slotid.hrc 8 Sep 2005 09:48:15 -0000 1.7 +++ dbaccess_slotid.hrc 3 Jan 2006 08:07:44 -0000 1.7.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbaccess_slotid.hrc,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 09:48:15 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -113,6 +113,7 @@ #define SID_DB_APP_SENDREPORTTOWRITER ( SID_DBACCESS_START + 62 ) #define SID_DB_FORM_NEW_PILOT ( SID_DBACCESS_START + 63 ) #define SID_DB_NEW_VIEW_SQL ( SID_DBACCESS_START + 64 ) +#define SID_APP_NEW_REPORT ( SID_DBACCESS_START + 65 ) Directory: /dba/dbaccess/prj/ ============================= File [changed]: d.lst Url: http://dba.openoffice.org/source/browse/dba/dbaccess/prj/d.lst?r1=1.18&r2=1.18.130.1 Delta lines: +6 -0 ------------------- --- d.lst 17 Nov 2004 14:40:51 -0000 1.18 +++ d.lst 3 Jan 2006 08:07:44 -0000 1.18.130.1 @@ -17,6 +17,8 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtable\menubar mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtable\toolbar +mkdir: %_DEST%\inc%_EXT%\dbaccess + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% @@ -25,6 +27,7 @@ ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe +..\%__SRC%\lib\idbu* %_DEST%\lib%_EXT%\idbu* *.xml %_DEST%\xml%_EXT%\*.xml touch: ..\%__SRC%\misc\dbaccess.hid %_DEST%\bin%_EXT%\dba.hid @@ -40,5 +43,8 @@ ..\uiconfig\dbquery\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbquery\toolbar\*.xml ..\uiconfig\dbrelation\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbrelation\toolbar\*.xml ..\uiconfig\dbtable\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbtable\toolbar\*.xml + +hedabu: ..\inc\*.hxx %_DEST%\inc%_EXT%\dbaccess\*.hxx +hedabu: ..\inc\*.h %_DEST%\inc%_EXT%\dbaccess\*.h dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.137&r2=1.137.4.1 Delta lines: +3 -4 ------------------- --- RowSet.cxx 23 Sep 2005 14:36:38 -0000 1.137 +++ RowSet.cxx 3 Jan 2006 08:07:45 -0000 1.137.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: RowSet.cxx,v $ * - * $Revision: 1.137 $ + * $Revision: 1.137.4.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 14:36:38 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1820,7 +1820,6 @@ m_xColumns->getByName(aSeq.getConstArray()[i-1]) >>= xColumn; } } - DBG_ASSERT(xColumn.is(), "ORowSet::execute_NoApprove_NoNewConn: invalid column (NULL)!"); if(bReFetchName && xColumn.is()) xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; aColumnMap.insert(::std::map< Reference<XPropertySet>,int>::value_type(xColumn,0)); File [changed]: RowSetCache.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCache.cxx?r1=1.78&r2=1.78.4.1 Delta lines: +4 -5 ------------------- --- RowSetCache.cxx 23 Sep 2005 12:03:25 -0000 1.78 +++ RowSetCache.cxx 3 Jan 2006 08:07:46 -0000 1.78.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: RowSetCache.cxx,v $ * - * $Revision: 1.78 $ + * $Revision: 1.78.4.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:03:25 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -139,7 +139,7 @@ ,m_nPosition(0) ,m_nRowCount(0) ,m_bBeforeFirst(sal_True) - ,m_bAfterLast(sal_False) + ,m_bAfterLast(sal_True) ,m_bRowCountFinal(sal_False) ,m_bInserted(sal_False) ,m_bDeleted(sal_False) @@ -224,7 +224,6 @@ if ( xColSup.is() ) { Reference<XNameAccess> xSelColumns = xColSup->getColumns(); - Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); OColumnNamePos aColumnNames(xMeta.is() && xMeta->storesMixedCaseQuotedIdentifiers() ? true : false); ::dbaccess::getColumnPositions(xSelColumns,xColumns,aUpdateTableName,aColumnNames); File [changed]: SingleSelectQueryComposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.11&r2=1.11.8.1 Delta lines: +12 -9 -------------------- --- SingleSelectQueryComposer.cxx 8 Sep 2005 10:03:23 -0000 1.11 +++ SingleSelectQueryComposer.cxx 3 Jan 2006 08:07:46 -0000 1.11.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: SingleSelectQueryComposer.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.8.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 10:03:23 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -728,13 +728,16 @@ ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_aCurrentColumns[SelectColumns] ) + { + ::std::vector< ::rtl::OUString> aNames; + ::vos::ORef< OSQLColumns> aCols; + sal_Bool bCase = sal_True; try { + bCase = m_xMetaData->storesMixedCaseQuotedIdentifiers(); + aCols = m_aSqlIterator.getSelectColumns(); // now set the columns we have to look if the order of the columns is correct Reference<XStatement> xStmt = m_xConnection->createStatement(); - - ::std::vector< ::rtl::OUString> aNames; - ::vos::ORef< OSQLColumns> aCols = m_aSqlIterator.getSelectColumns(); if ( xStmt.is() ) { ::rtl::OUString sSql = m_aPureSelectSQL; @@ -828,12 +831,12 @@ for(OSQLColumns::const_iterator aIter = aCols->begin(); aIter != aCols->end();++aIter) aNames.push_back(getString((*aIter)->getPropertyValue(PROPERTY_NAME))); } - - m_aCurrentColumns[SelectColumns] = new OPrivateColumns(aCols,m_xMetaData->storesMixedCaseQuotedIdentifiers(),*this,m_aMutex,aNames); } catch(Exception&) { } + m_aCurrentColumns[SelectColumns] = new OPrivateColumns(aCols,bCase,*this,m_aMutex,aNames); + } return m_aCurrentColumns[SelectColumns]; } // ------------------------------------------------------------------------- Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ComponentDefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ComponentDefinition.hxx?r1=1.3&r2=1.3.8.1 Delta lines: +6 -3 ------------------- --- ComponentDefinition.hxx 8 Sep 2005 10:13:40 -0000 1.3 +++ ComponentDefinition.hxx 3 Jan 2006 08:07:47 -0000 1.3.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: ComponentDefinition.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.8.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 10:13:40 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -65,6 +65,9 @@ #endif #ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" +#endif +#ifndef _DBASHARED_APITOOLS_HXX_ +#include "apitools.hxx" #endif #ifndef _DBA_COREAPI_COLUMN_HXX_ #include <column.hxx> File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.22&r2=1.22.4.1 Delta lines: +4 -4 ------------------- --- databasedocument.cxx 23 Sep 2005 12:04:55 -0000 1.22 +++ databasedocument.cxx 3 Jan 2006 08:07:47 -0000 1.22.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.4.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:04:55 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -364,7 +364,7 @@ ::connectivity::checkDisposed(ODatabaseDocument_OfficeDocument::rBHelper.bDisposed); OSL_ENSURE(m_pImpl.is(),"Impl is NULL"); - m_pImpl->m_aControllers.erase(::std::find(m_pImpl->m_aControllers.begin(),m_pImpl->m_aControllers.end(),_xController)); + m_pImpl->m_aControllers.erase(::std::find(m_pImpl->m_aControllers.begin(),m_pImpl->m_aControllers.end(),_xController),m_pImpl->m_aControllers.end()); if ( m_pImpl->m_xCurrentController == _xController ) m_pImpl->m_xCurrentController = NULL; } File [changed]: documentcontainer.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.hxx?r1=1.8&r2=1.8.8.1 Delta lines: +6 -3 ------------------- --- documentcontainer.hxx 8 Sep 2005 13:29:51 -0000 1.8 +++ documentcontainer.hxx 3 Jan 2006 08:07:48 -0000 1.8.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: documentcontainer.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.8.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 13:29:51 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -59,6 +59,9 @@ #endif #ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> +#endif +#ifndef _DBASHARED_APITOOLS_HXX_ +#include "apitools.hxx" #endif //........................................................................ File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.29&r2=1.29.4.1 Delta lines: +33 -45 --------------------- --- documentdefinition.cxx 23 Sep 2005 12:06:25 -0000 1.29 +++ documentdefinition.cxx 3 Jan 2006 08:07:48 -0000 1.29.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.29.4.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:06:25 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -210,6 +210,12 @@ #ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_ #include <comphelper/sequenceashashmap.hxx> #endif +#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_ +#include <comphelper/mimeconfighelper.hxx> +#endif +#ifndef _COMPHELPER_STORAGEHELPER_HXX +#include <comphelper/storagehelper.hxx> +#endif using namespace ::com::sun::star::view; using namespace ::com::sun::star::uno; @@ -358,7 +364,9 @@ } ::rtl::OUString lcl_GetDocumentServiceFromMediaType( const Reference< XStorage >& xStorage - ,const ::rtl::OUString& sEntName ) + ,const ::rtl::OUString& sEntName + ,const Reference< XMultiServiceFactory >& _xORB + ) { ::rtl::OUString sResult; try @@ -379,21 +387,9 @@ catch ( Exception& ) { } - - if ( aMediaType.equalsAscii( "application/vnd.sun.xml.writer" ) ) - sResult = ::rtl::OUString::createFromAscii( "com.sun.star.comp.Writer.TextDocument" ); - else if ( aMediaType.equalsAscii( "application/vnd.sun.xml.writer.global" ) ) - sResult = ::rtl::OUString::createFromAscii( "com.sun.star.comp.Writer.GlobalDocument" ); - else if ( aMediaType.equalsAscii( "application/vnd.sun.xml.writer.web" ) ) - sResult = ::rtl::OUString::createFromAscii( "com.sun.star.comp.Writer.WebDocument" ); - else if ( aMediaType.equalsAscii( "application/vnd.sun.xml.calc" ) ) - sResult = ::rtl::OUString::createFromAscii( "com.sun.star.comp.Calc.SpreadsheetDocument" ); - else if ( aMediaType.equalsAscii( "application/vnd.sun.xml.impress" ) ) - sResult = ::rtl::OUString::createFromAscii( "com.sun.star.comp.Draw.PresentationDocument" ); - else if ( aMediaType.equalsAscii( "application/vnd.sun.xml.draw" ) ) - sResult = ::rtl::OUString::createFromAscii( "com.sun.star.comp.Draw.DrawingDocument" ); - else if ( aMediaType.equalsAscii( "application/vnd.sun.xml.math" ) ) - sResult = ::rtl::OUString::createFromAscii( "com.sun.star.comp.Math.FormulaDocument" ); + ::comphelper::MimeConfigurationHelper aConfigHelper(_xORB); + sResult = aConfigHelper.GetDocServiceNameFromMediaType(aMediaType); + //_rClassID = aConfigHelper.GetSequenceClassIDRepresentation(aConfigHelper.GetExplicitlyRegisteredObjClassID(aMediaType)); try { @@ -410,30 +406,6 @@ return sResult; } // ----------------------------------------------------------------------------- -Sequence< sal_Int8 > lcl_GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3, - sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11, - sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 ) -{ - Sequence< sal_Int8 > aResult( 16 ); - aResult[0] = static_cast<sal_Int8>(n1 >> 24); - aResult[1] = static_cast<sal_Int8>(( n1 << 8 ) >> 24); - aResult[2] = static_cast<sal_Int8>(( n1 << 16 ) >> 24); - aResult[3] = static_cast<sal_Int8>(( n1 << 24 ) >> 24); - aResult[4] = n2 >> 8; - aResult[5] = ( n2 << 8 ) >> 8; - aResult[6] = n3 >> 8; - aResult[7] = ( n3 << 8 ) >> 8; - aResult[8] = b8; - aResult[9] = b9; - aResult[10] = b10; - aResult[11] = b11; - aResult[12] = b12; - aResult[13] = b13; - aResult[14] = b14; - aResult[15] = b15; - - return aResult; -} //========================================================================== //= ODocumentDefinition //========================================================================== @@ -1065,11 +1037,15 @@ { nEntryConnectionMode = EntryInitModes::TRUNCATE_INIT; bSetSize = sal_True; + xStorage = OStorageHelper::GetTemporaryStorage(m_xORB); } else { - aClassID = lcl_GetSequenceClassID(SO3_SW_CLASSID); - sDocumentService = lcl_GetDocumentServiceFromMediaType(xStorage,m_pImpl->m_aProps.sPersistentName); + if ( m_bForm ) + aClassID = MimeConfigurationHelper::GetSequenceClassID(SO3_SW_CLASSID); + else + aClassID = MimeConfigurationHelper::GetSequenceClassID(SO3_RPT_CLASSID_90); + sDocumentService = lcl_GetDocumentServiceFromMediaType(xStorage,m_pImpl->m_aProps.sPersistentName,m_xORB); } Sequence<PropertyValue> aArgs,aEmbeddedObjectDescriptor; @@ -1085,6 +1061,18 @@ ),UNO_QUERY); if ( m_xEmbeddedObject.is() ) { + if ( bSetSize ) + { + Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); + if ( xPersist.is() ) + { + xPersist->storeAsEntry( getStorage() + ,m_pImpl->m_aProps.sPersistentName + ,aArgs + ,aEmbeddedObjectDescriptor); + xPersist->saveCompleted(sal_True); + } + } if ( !m_pClientHelper ) { m_pClientHelper = new OEmbeddedClientHelper(this); Directory: /dba/dbaccess/source/core/inc/ ========================================= File [changed]: ContentHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/ContentHelper.hxx?r1=1.6&r2=1.6.8.1 Delta lines: +8 -10 -------------------- --- ContentHelper.hxx 8 Sep 2005 13:32:58 -0000 1.6 +++ ContentHelper.hxx 3 Jan 2006 08:07:49 -0000 1.6.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: ContentHelper.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.8.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 13:32:58 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,9 +35,6 @@ #ifndef DBA_CONTENTHELPER_HXX #define DBA_CONTENTHELPER_HXX -#ifndef _DBASHARED_APITOOLS_HXX_ -#include "apitools.hxx" -#endif #ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include <com/sun/star/ucb/XContent.hpp> #endif @@ -99,7 +96,6 @@ #include <boost/shared_ptr.hpp> #endif - namespace dbaccess { class ODatabaseModelImpl; @@ -187,10 +183,12 @@ ); // com::sun::star::lang::XTypeProvider - DECLARE_IMPLEMENTATION_ID( ); + virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // ::com::sun::star::lang::XServiceInfo - DECLARE_SERVICE_INFO(); - + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); // XContent virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException) ; File [changed]: definitioncontainer.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/definitioncontainer.hxx?r1=1.3&r2=1.3.8.1 Delta lines: +6 -4 ------------------- --- definitioncontainer.hxx 8 Sep 2005 13:36:54 -0000 1.3 +++ definitioncontainer.hxx 3 Jan 2006 08:07:49 -0000 1.3.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: definitioncontainer.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.8.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 13:36:54 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -84,7 +84,9 @@ #ifndef _RTL_REF_HXX_ #include <rtl/ref.hxx> #endif - +#ifndef _DBASHARED_APITOOLS_HXX_ +#include "apitools.hxx" +#endif //........................................................................ namespace dbaccess { Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/makefile.mk?r1=1.4&r2=1.4.4.1 Delta lines: +3 -4 ------------------- --- makefile.mk 23 Sep 2005 12:08:08 -0000 1.4 +++ makefile.mk 3 Jan 2006 08:07:50 -0000 1.4.4.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.4.1 $ # -# last change: $Author: hr $ $Date: 2005/09/23 12:08:08 $ +# last change: $Author: oj $ $Date: 2006/01/03 08:07:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -101,7 +101,6 @@ SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) SHL1STDLIBS=\ - $(SVXLIB) \ $(XMLOFFLIB) \ $(VCLLIB) \ $(UNOTOOLSLIB) \ Directory: /dba/dbaccess/source/inc/ ==================================== File [changed]: dbustrings.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/inc/dbustrings.hrc?r1=1.11&r2=1.11.8.1 Delta lines: +4 -3 ------------------- --- dbustrings.hrc 8 Sep 2005 14:13:37 -0000 1.11 +++ dbustrings.hrc 3 Jan 2006 08:07:51 -0000 1.11.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbustrings.hrc,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.8.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 14:13:37 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -54,6 +54,7 @@ DECLARE_CONSTASCII_USTRING(URL_COMPONENT_DATASOURCEBROWSER); DECLARE_CONSTASCII_USTRING(URL_COMPONENT_RELATIONDESIGN); DECLARE_CONSTASCII_USTRING(URL_COMPONENT_APPLICATION); + DECLARE_CONSTASCII_USTRING(URL_COMPONENT_REPORTDESIGN); //============================================================ //= service names Directory: /dba/dbaccess/source/shared/ ======================================= File [changed]: dbustrings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/shared/dbustrings.cxx?r1=1.10&r2=1.10.8.1 Delta lines: +4 -3 ------------------- --- dbustrings.cxx 8 Sep 2005 14:16:31 -0000 1.10 +++ dbustrings.cxx 3 Jan 2006 08:07:51 -0000 1.10.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbustrings.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.8.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 14:16:31 $ + * last change: $Author: oj $ $Date: 2006/01/03 08:07:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,6 +48,7 @@ IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_DATASOURCEBROWSER, ".component:DB/DataSourceBrowser"); IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_RELATIONDESIGN, ".component:DB/RelationDesign"); IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_APPLICATION, ".component:DB/Application"); + IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_REPORTDESIGN, ".component:DB/ReportDesign"); //============================================================ //= service names Directory: /dba/dbaccess/uiconfig/dbapp/menubar/ ================================================ File [changed]: menubar.xml Url: http://dba.openoffice.org/source/browse/dba/dbaccess/uiconfig/dbapp/menubar/menubar.xml?r1=1.6&r2=1.6.130.1 Delta lines: +1 -1 ------------------- --- menubar.xml 17 Nov 2004 14:54:32 -0000 1.6 +++ menubar.xml 3 Jan 2006 08:07:52 -0000 1.6.130.1 @@ -87,7 +87,7 @@ <menu:menu menu:id=".uno:InsertMenu" menu:label="" > <menu:menupopup> <menu:menuitem menu:id=".uno:DBNewForm" menu:helpid="12305" menu:label="" /> - <menu:menuitem menu:id=".uno:DBNewReportAutoPilot" menu:helpid="38995" menu:label="" /> + <menu:menuitem menu:id=".uno:DBNewReport" menu:helpid="12316" menu:label="" /> <menu:menuitem menu:id=".uno:DBNewQuery" menu:helpid="38873" menu:label="" /> <menu:menuitem menu:id=".uno:DBNewQuerySql" menu:helpid="38841" menu:label="" /> <menu:menuseparator/> Directory: /dba/dbaccess/util/ ============================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/util/makefile.mk?r1=1.25&r2=1.25.8.1 Delta lines: +8 -4 ------------------- --- makefile.mk 8 Sep 2005 16:54:13 -0000 1.25 +++ makefile.mk 3 Jan 2006 08:07:52 -0000 1.25.8.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.25 $ +# $Revision: 1.25.8.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 16:54:13 $ +# last change: $Author: oj $ $Date: 2006/01/03 08:07:52 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -127,10 +127,14 @@ $(VOSLIB) \ $(SALLIB) +SHL2DEPN= +SHL2IMPLIB=i$(TARGET2) SHL2LIBS=$(LIB2TARGET) SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME=$(SHL2TARGET) -SHL2VERSIONMAP=$(TARGET2).map +DEFLIB2NAME=$(TARGET2) +# SHL2VERSIONMAP=$(TARGET2).map +SHL2USE_EXPORTS=ordinal ALL: \ $(LIB2TARGET) \ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
