Tag: cws_src680_dba30a User: fs Date: 2008-02-20 21:31:59+0000 Modified: dba/dbaccess/source/core/api/KeySet.cxx dba/dbaccess/source/core/dataaccess/databasedocument.hxx dba/dbaccess/source/core/dataaccess/datasource.cxx dba/dbaccess/source/core/dataaccess/datasource.hxx dba/dbaccess/source/filter/xml/xmlConnectionResource.cxx dba/dbaccess/source/filter/xml/xmlConnectionResource.hxx dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx dba/dbaccess/source/filter/xml/xmlServerDatabase.cxx dba/dbaccess/source/filter/xml/xmlServerDatabase.hxx dba/dbaccess/source/ui/app/AppController.hxx dba/dbaccess/source/ui/app/AppControllerDnD.cxx dba/dbaccess/source/ui/control/RelationControl.cxx dba/dbaccess/source/ui/dlg/tablespage.cxx dba/dbaccess/source/ui/dlg/tablespage.hxx dba/dbaccess/source/ui/inc/RelationControl.hxx dba/dbaccess/source/ui/inc/WCopyTable.hxx dba/dbaccess/source/ui/inc/dsmeta.hxx dba/dbaccess/source/ui/misc/WCopyTable.cxx dba/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx dba/dbaccess/source/ui/misc/dsmeta.cxx dba/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx dba/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
Log: remove unused code Issue number: #i86284# Submitted by: [EMAIL PROTECTED] Reviewed by: [EMAIL PROTECTED] File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: KeySet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/KeySet.cxx?r1=1.69&r2=1.69.12.1 Delta lines: +4 -3 ------------------- --- KeySet.cxx 2008-01-30 08:28:36+0000 1.69 +++ KeySet.cxx 2008-02-20 21:31:54+0000 1.69.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: KeySet.cxx,v $ * - * $Revision: 1.69 $ + * $Revision: 1.69.12.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:28:36 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -101,6 +101,7 @@ #endif #include <list> #include <algorithm> +#include <string.h> #ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_ #include <com/sun/star/io/XInputStream.hpp> #endif Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.hxx?r1=1.15&r2=1.15.10.1 Delta lines: +3 -5 ------------------- --- databasedocument.hxx 2008-01-30 08:33:46+0000 1.15 +++ databasedocument.hxx 2008-02-20 21:31:54+0000 1.15.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: databasedocument.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.15.10.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:33:46 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -126,8 +126,6 @@ ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms; ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports; - void setMeAsParent(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xName); - /** stores the model @param sURL The URL File [changed]: datasource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.cxx?r1=1.75&r2=1.75.10.1 Delta lines: +3 -9 ------------------- --- datasource.cxx 2008-01-30 08:33:58+0000 1.75 +++ datasource.cxx 2008-02-20 21:31:54+0000 1.75.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: datasource.cxx,v $ * - * $Revision: 1.75 $ + * $Revision: 1.75.10.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:33:58 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -634,12 +634,6 @@ dispose(); } } -// ----------------------------------------------------------------------------- -void ODatabaseSource::setMeAsParent(const Reference< XNameAccess >& _xName) -{ - Reference<XChild> xChild(_xName,UNO_QUERY); - xChild->setParent(*this); -} // com::sun::star::lang::XTypeProvider //-------------------------------------------------------------------------- Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException) File [changed]: datasource.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.hxx?r1=1.38&r2=1.38.10.1 Delta lines: +3 -5 ------------------- --- datasource.hxx 2008-01-30 08:34:12+0000 1.38 +++ datasource.hxx 2008-02-20 21:31:54+0000 1.38.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: datasource.hxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.38.10.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:34:12 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -179,8 +179,6 @@ OBookmarkContainer m_aBookmarks; ::cppu::OInterfaceContainerHelper m_aFlushListeners; - void setMeAsParent(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xName); - private: virtual ~ODatabaseSource(); Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlConnectionResource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlConnectionResource.cxx?r1=1.2&r2=1.2.36.1 Delta lines: +2 -7 ------------------- --- xmlConnectionResource.cxx 2007-11-09 08:13:31+0000 1.2 +++ xmlConnectionResource.cxx 2008-02-20 21:31:54+0000 1.2.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlConnectionResource.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.36.1 $ * - * last change: $Author: rt $ $Date: 2007/11/09 08:13:31 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -133,11 +133,6 @@ DBG_DTOR(OXMLConnectionResource,NULL); } // ----------------------------------------------------------------------------- -ODBFilter& OXMLConnectionResource::GetOwnImport() -{ - return static_cast<ODBFilter&>(GetImport()); -} -// ----------------------------------------------------------------------------- //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- File [changed]: xmlConnectionResource.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlConnectionResource.hxx?r1=1.2&r2=1.2.36.1 Delta lines: +2 -3 ------------------- --- xmlConnectionResource.hxx 2007-11-09 08:13:44+0000 1.2 +++ xmlConnectionResource.hxx 2008-02-20 21:31:55+0000 1.2.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlConnectionResource.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.36.1 $ * - * last change: $Author: rt $ $Date: 2007/11/09 08:13:44 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,7 +48,6 @@ class ODBFilter; class OXMLConnectionResource : public SvXMLImportContext { - ODBFilter& GetOwnImport(); public: OXMLConnectionResource( ODBFilter& rImport, sal_uInt16 nPrfx, File [changed]: xmlFileBasedDatabase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx?r1=1.2&r2=1.2.36.1 Delta lines: +2 -7 ------------------- --- xmlFileBasedDatabase.cxx 2007-11-09 08:17:05+0000 1.2 +++ xmlFileBasedDatabase.cxx 2008-02-20 21:31:55+0000 1.2.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlFileBasedDatabase.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.36.1 $ * - * last change: $Author: rt $ $Date: 2007/11/09 08:17:05 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -158,11 +158,6 @@ DBG_DTOR(OXMLFileBasedDatabase,NULL); } // ----------------------------------------------------------------------------- -ODBFilter& OXMLFileBasedDatabase::GetOwnImport() -{ - return static_cast<ODBFilter&>(GetImport()); -} -// ----------------------------------------------------------------------------- //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- File [changed]: xmlFileBasedDatabase.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx?r1=1.2&r2=1.2.36.1 Delta lines: +2 -3 ------------------- --- xmlFileBasedDatabase.hxx 2007-11-09 08:17:16+0000 1.2 +++ xmlFileBasedDatabase.hxx 2008-02-20 21:31:55+0000 1.2.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlFileBasedDatabase.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.36.1 $ * - * last change: $Author: rt $ $Date: 2007/11/09 08:17:16 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,7 +48,6 @@ class ODBFilter; class OXMLFileBasedDatabase : public SvXMLImportContext { - ODBFilter& GetOwnImport(); public: OXMLFileBasedDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, File [changed]: xmlServerDatabase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlServerDatabase.cxx?r1=1.2&r2=1.2.36.1 Delta lines: +2 -7 ------------------- --- xmlServerDatabase.cxx 2007-11-09 08:18:08+0000 1.2 +++ xmlServerDatabase.cxx 2008-02-20 21:31:55+0000 1.2.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlServerDatabase.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.36.1 $ * - * last change: $Author: rt $ $Date: 2007/11/09 08:18:08 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -190,11 +190,6 @@ DBG_DTOR(OXMLServerDatabase,NULL); } // ----------------------------------------------------------------------------- -ODBFilter& OXMLServerDatabase::GetOwnImport() -{ - return static_cast<ODBFilter&>(GetImport()); -} -// ----------------------------------------------------------------------------- //---------------------------------------------------------------------------- } // namespace dbaxml File [changed]: xmlServerDatabase.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlServerDatabase.hxx?r1=1.2&r2=1.2.36.1 Delta lines: +2 -3 ------------------- --- xmlServerDatabase.hxx 2007-11-09 08:18:22+0000 1.2 +++ xmlServerDatabase.hxx 2008-02-20 21:31:55+0000 1.2.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlServerDatabase.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.36.1 $ * - * last change: $Author: rt $ $Date: 2007/11/09 08:18:22 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,7 +48,6 @@ class ODBFilter; class OXMLServerDatabase : public SvXMLImportContext { - ODBFilter& GetOwnImport(); public: OXMLServerDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.hxx?r1=1.23&r2=1.23.8.1 Delta lines: +3 -11 -------------------- --- AppController.hxx 2008-01-30 08:41:20+0000 1.23 +++ AppController.hxx 2008-02-20 21:31:55+0000 1.23.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.hxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.23.8.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:41:20 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -293,14 +293,6 @@ /// copies the current object into clipboard TransferableHelper* copyObject(); - /** fills all elements of the wanted type into the list. - @param _eType - The type. - @param _rList - The list to fill. - */ - void getElements(ElementType _eType,::std::vector< ::rtl::OUString>& _rList); - /// returns the nameaccess ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getElements(ElementType _eType); File [changed]: AppControllerDnD.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerDnD.cxx?r1=1.24&r2=1.24.10.1 Delta lines: +3 -19 -------------------- --- AppControllerDnD.cxx 2008-01-29 08:51:43+0000 1.24 +++ AppControllerDnD.cxx 2008-02-20 21:31:55+0000 1.24.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppControllerDnD.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.24.10.1 $ * - * last change: $Author: vg $ $Date: 2008/01/29 08:51:43 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -570,22 +570,6 @@ return xElements; } // ----------------------------------------------------------------------------- -void OApplicationController::getElements(ElementType _eType,::std::vector< ::rtl::OUString>& _rList) -{ - OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); - // TODO get a list for all object - Reference< XNameAccess > xElements = getElements(_eType); - if ( xElements.is() ) - { - Sequence< ::rtl::OUString> aSeq = xElements->getElementNames(); - _rList.reserve(aSeq.getLength()); - - const ::rtl::OUString* pBegin = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aSeq.getLength(); - ::std::copy(pBegin,pEnd,::std::back_inserter(_rList)); - } -} -// ----------------------------------------------------------------------------- void OApplicationController::impl_initialize() { Reference<XModifiable> xModi(m_xModel,UNO_QUERY); Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: RelationControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/RelationControl.cxx?r1=1.22&r2=1.22.48.1 Delta lines: +3 -8 ------------------- --- RelationControl.cxx 2007-11-01 15:04:02+0000 1.22 +++ RelationControl.cxx 2008-02-20 21:31:55+0000 1.22.48.1 @@ -4,9 +4,9 @@ * * $RCSfile: RelationControl.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.48.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:04:02 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -736,11 +736,6 @@ return m_pRC_Tables->getData()->getReferencingTable(); } // ----------------------------------------------------------------------------- - TTableWindowData::value_type OTableListBoxControl::getReferencedTable() const - { - return m_pRC_Tables->getData()->getReferencedTable(); - } - // ----------------------------------------------------------------------------- void OTableListBoxControl::enableRelation(bool _bEnable) { if ( !_bEnable ) Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: tablespage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/tablespage.cxx?r1=1.30.116.1&r2=1.30.116.2 Delta lines: +2 -47 -------------------- --- tablespage.cxx 2008-01-14 09:12:24+0000 1.30.116.1 +++ tablespage.cxx 2008-02-20 21:31:55+0000 1.30.116.2 @@ -4,9 +4,9 @@ * * $RCSfile: tablespage.cxx,v $ * - * $Revision: 1.30.116.1 $ + * $Revision: 1.30.116.2 $ * - * last change: $Author: fs $ $Date: 2008/01/14 09:12:24 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -513,51 +513,6 @@ return OnControlModified(_pControl); } //------------------------------------------------------------------------ - SvLBoxEntry* OTableSubscriptionPage::getEntryFromPath(const ::rtl::OUString& _rPath) - { - const sal_Unicode aSeparator = '.'; - - SvLBoxEntry* pParent = m_aTablesList.getAllObjectsEntry(); - - sal_Int32 nSepPos = -1; - sal_Int32 nPreviousSegmentStart = 0; - - nSepPos = _rPath.indexOf(aSeparator, nPreviousSegmentStart); - while ((nPreviousSegmentStart >= 0) && pParent) - { - String sSegmentName = _rPath.copy( - nPreviousSegmentStart, - (nSepPos > nPreviousSegmentStart ? nSepPos : _rPath.getLength()) - nPreviousSegmentStart); - - SvLBoxEntry* pChildSearch = m_aTablesList.FirstChild(pParent); - String sChildText; - while (pChildSearch) - { - sChildText = m_aTablesList.GetEntryText(pChildSearch); - if (sChildText == sSegmentName) - break; - - pChildSearch = m_aTablesList.NextSibling(pChildSearch); - } - - if (!pChildSearch) - { // did not find this levels child - pParent = NULL; - break; - } - - pParent = pChildSearch; - - if (nSepPos > 0) - nSepPos = _rPath.indexOf(aSeparator, nPreviousSegmentStart = (nSepPos + 1)); - else - nPreviousSegmentStart = -1; - } - - return pParent; - } - - //------------------------------------------------------------------------ IMPL_LINK( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData*, _pSortData ) { SvLBoxEntry* pLHS = static_cast<SvLBoxEntry*>(_pSortData->pLeft); File [changed]: tablespage.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/tablespage.hxx?r1=1.13.132.1&r2=1.13.132.2 Delta lines: +2 -5 ------------------- --- tablespage.hxx 2008-01-14 09:12:24+0000 1.13.132.1 +++ tablespage.hxx 2008-02-20 21:31:56+0000 1.13.132.2 @@ -4,9 +4,9 @@ * * $RCSfile: tablespage.hxx,v $ * - * $Revision: 1.13.132.1 $ + * $Revision: 1.13.132.2 $ * - * last change: $Author: fs $ $Date: 2008/01/14 09:12:24 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -125,9 +125,6 @@ */ ::com::sun::star::uno::Sequence< ::rtl::OUString > collectDetailedSelection() const; - /// get the entry described by the given path - SvLBoxEntry* getEntryFromPath(const ::rtl::OUString& _rPath); - /// (un)check all entries void CheckAll( BOOL bCheck = sal_True ); Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: RelationControl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/RelationControl.hxx?r1=1.5&r2=1.5.48.1 Delta lines: +3 -4 ------------------- --- RelationControl.hxx 2007-11-01 15:17:32+0000 1.5 +++ RelationControl.hxx 2008-02-20 21:31:56+0000 1.5.48.1 @@ -4,9 +4,9 @@ * * $RCSfile: RelationControl.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.48.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:17:32 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -106,7 +106,6 @@ BOOL SaveModified(); TTableWindowData::value_type getReferencingTable() const; - TTableWindowData::value_type getReferencedTable() const; /** getContainer returns the container interface @return the interface of the container File [changed]: WCopyTable.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/WCopyTable.hxx?r1=1.24&r2=1.24.12.1 Delta lines: +4 -6 ------------------- --- WCopyTable.hxx 2008-01-30 08:48:35+0000 1.24 +++ WCopyTable.hxx 2008-02-20 21:31:56+0000 1.24.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: WCopyTable.hxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.24.12.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:48:35 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -447,8 +447,6 @@ void showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName); void removeColumnNameFromNameMap(const ::rtl::OUString& _sName); - - void SetTableName( const ::rtl::OUString& _rName ); }; } File [changed]: dsmeta.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dsmeta.hxx?r1=1.3&r2=1.3.34.1 Delta lines: +3 -6 ------------------- --- dsmeta.hxx 2007-11-27 12:12:42+0000 1.3 +++ dsmeta.hxx 2008-02-20 21:31:56+0000 1.3.34.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsmeta.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.34.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/27 12:12:42 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,9 +78,6 @@ DataSourceMetaData( DATASOURCE_TYPE _eType ); ~DataSourceMetaData(); - /// returns the data source type for this instance - DATASOURCE_TYPE getType() const; - /// returns a struct describing this data source type's support for our known advanced settings const AdvancedSettingsSupport& getAdvancedSettingsSupport() const; Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: WCopyTable.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCopyTable.cxx?r1=1.55&r2=1.55.12.1 Delta lines: +3 -10 -------------------- --- WCopyTable.cxx 2008-01-30 08:51:55+0000 1.55 +++ WCopyTable.cxx 2008-02-20 21:31:56+0000 1.55.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: WCopyTable.cxx,v $ * - * $Revision: 1.55 $ + * $Revision: 1.55.12.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:51:55 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1602,11 +1602,4 @@ OSQLMessageBox aMsg(this,sTitle,sMessage); aMsg.Execute(); } -// ----------------------------------------------------------------------------- -void OCopyTableWizard::SetTableName( const ::rtl::OUString& _rName ) -{ - if ( _rName.getLength() != 0 ) - m_sName = _rName; - -} //------------------------------------------------------------------------------- File [changed]: defaultobjectnamecheck.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx?r1=1.3&r2=1.3.216.1 Delta lines: +3 -41 -------------------- --- defaultobjectnamecheck.cxx 2006-09-17 07:16:34+0000 1.3 +++ defaultobjectnamecheck.cxx 2008-02-20 21:31:56+0000 1.3.216.1 @@ -4,9 +4,9 @@ * * $RCSfile: defaultobjectnamecheck.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.216.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 07:16:34 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -131,44 +131,6 @@ _out_rErrorToDisplay = aError; } - /** retrieves an container of queries or tables from a given SDB-level connection - @param _rxSdbLevelConnection - the connection object. Must not be <NULL/>. - @param _nCommandType - the CommandType specifying whether tables or queries should be obtained. Only - CommandType::TABLE and CommandType::QUERY are valid values, for all other values, - the behavior is undefined. - @throws RuntimeException - if the given connection does not provide the desired object container - */ - Reference< XNameAccess > lcl_getObjectContainer( const Reference< XConnection >& _rxSdbLevelConnection, sal_Int32 _nCommandType ) - { - OSL_ENSURE( _rxSdbLevelConnection.is(), "lcl_getObjectContainer: this will crash!" ); - - Reference< XNameAccess > xContainer; - switch ( _nCommandType ) - { - case CommandType::TABLE: - { - Reference< XTablesSupplier > xSupplier( _rxSdbLevelConnection, UNO_QUERY_THROW ); - xContainer = Reference< XNameAccess >( xSupplier->getTables(), UNO_QUERY_THROW ); - } - break; - - case CommandType::QUERY: - { - Reference< XQueriesSupplier > xSupplier( _rxSdbLevelConnection, UNO_QUERY_THROW ); - xContainer = Reference< XNameAccess >( xSupplier->getQueries(), UNO_QUERY_THROW ); - } - break; - - default: - OSL_ENSURE( false, "lcl_getObjectContainer: unsupported command type!" ); - break; - } - - return xContainer; - } } //==================================================================== File [changed]: dsmeta.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsmeta.cxx?r1=1.5.12.1&r2=1.5.12.2 Delta lines: +2 -8 ------------------- --- dsmeta.cxx 2008-02-14 08:37:49+0000 1.5.12.1 +++ dsmeta.cxx 2008-02-20 21:31:56+0000 1.5.12.2 @@ -4,9 +4,9 @@ * * $RCSfile: dsmeta.cxx,v $ * - * $Revision: 1.5.12.1 $ + * $Revision: 1.5.12.2 $ * - * last change: $Author: oj $ $Date: 2008/02/14 08:37:49 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -241,12 +241,6 @@ } //-------------------------------------------------------------------- - DATASOURCE_TYPE DataSourceMetaData::getType() const - { - return m_pImpl->getType(); - } - - //-------------------------------------------------------------------- const AdvancedSettingsSupport& DataSourceMetaData::getAdvancedSettingsSupport() const { return ::dbaui::getAdvancedSettingsSupport( m_pImpl->getType() ); Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: FieldDescGenWin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx?r1=1.12&r2=1.12.134.1 Delta lines: +5 -3 ------------------- --- FieldDescGenWin.cxx 2007-05-10 10:41:08+0000 1.12 +++ FieldDescGenWin.cxx 2008-02-20 21:31:57+0000 1.12.134.1 @@ -4,9 +4,9 @@ * * $RCSfile: FieldDescGenWin.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.134.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:41:08 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -122,12 +122,14 @@ m_pFieldControl->DisplayData(pFieldDescr); } //------------------------------------------------------------------------------ +#if OSL_DEBUG_LEVEL > 0 OTableEditorCtrl* OFieldDescGenWin::GetEditorCtrl() { DBG_CHKTHIS(OFieldDescGenWin,NULL); OTableDesignView* pDesignWin = static_cast<OTableDesignView*>(GetParent()->GetParent()->GetParent()); return pDesignWin->GetEditorCtrl(); } +#endif //------------------------------------------------------------------------------ //short OFieldDescGenWin::GetFormatCategory(OFieldDescription* pFieldDescr) //{ File [changed]: FieldDescGenWin.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx?r1=1.8&r2=1.8.134.1 Delta lines: +5 -4 ------------------- --- FieldDescGenWin.hxx 2007-05-10 10:41:22+0000 1.8 +++ FieldDescGenWin.hxx 2008-02-20 21:31:57+0000 1.8.134.1 @@ -4,9 +4,9 @@ * * $RCSfile: FieldDescGenWin.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.134.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:41:22 $ + * last change: $Author: fs $ $Date: 2008/02/20 21:31:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,8 +70,9 @@ void SetControlText( USHORT nControlId, const String& rText ); String GetControlText( USHORT nControlId ); void SetReadOnly( BOOL bReadOnly ); +#if OSL_DEBUG_LEVEL > 0 OTableEditorCtrl* GetEditorCtrl(); - +#endif // short GetFormatCategory(OFieldDescription* pFieldDescr); // liefert zum am Feld eingestellten Format einen der CAT_xxx-Werte (CAT_NUMBER, CAT_DATE ...) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
