diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
commit | 92667c8edbaee9a252b1d5d221eb62849f76697c (patch) | |
tree | 8f1d329f2259b7d5bff054bc14d0965637df6961 /connectivity/source/inc/dbase/DIndexPage.hxx | |
parent | baecdfb578cb7bc992944857ad4d8882ef7e842c (diff) | |
parent | 48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
Diffstat (limited to 'connectivity/source/inc/dbase/DIndexPage.hxx')
-rw-r--r-- | connectivity/source/inc/dbase/DIndexPage.hxx | 57 |
1 files changed, 3 insertions, 54 deletions
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx index 2ec510a234ff..2e693765cad4 100644 --- a/connectivity/source/inc/dbase/DIndexPage.hxx +++ b/connectivity/source/inc/dbase/DIndexPage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,62 +29,10 @@ #ifndef _CONNECTIVITY_DBASE_INDEXPAGE_HXX_ #define _CONNECTIVITY_DBASE_INDEXPAGE_HXX_ -//#ifndef _REF_HXX -//#include <tools/ref.hxx> -//#endif -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #include <tools/stream.hxx> -#ifndef _VECTOR_ #include <vector> -#endif -//#ifndef _CONNECTIVITY_FILE_FCODE_HXX_ -//#include "file/fcode.hxx" -//#endif -//#ifndef _CONNECTIVITY_DBASE_INDEXNODE_HXX_ -//#include "dbase/dindexnode.hxx" -//#endif -#if 0 -namespace connectivity -{ - namespace dbase - { - //================================================================== - // Index Seitenverweis - //================================================================== - // SV_DECL_REF(ONDXPage); // Basisklasse da weitere Informationen gehalten werden muessen - - class ONDXPage; - typedef vos::ORef<ONDXPage> ONDXPagePtr_BASE; - - class ONDXPagePtr : public ONDXPagePtr_BASE //ONDXPageRef - { - friend SvStream& operator << (SvStream &rStream, const ONDXPagePtr&); - friend SvStream& operator >> (SvStream &rStream, ONDXPagePtr&); - - sal_uInt32 nPagePos; // Position in der Indexdatei - - public: - ONDXPagePtr(sal_uInt32 nPos = 0):nPagePos(nPos){} - ONDXPagePtr(const ONDXPagePtr& rRef); - ONDXPagePtr(ONDXPage* pRefPage); - - ONDXPagePtr& operator=(const ONDXPagePtr& rRef); - ONDXPagePtr& operator=(ONDXPage* pPageRef); - - sal_uInt32 GetPagePos() const {return nPagePos;} - sal_Bool HasPage() const {return nPagePos != 0;} - sal_Bool Is() const { return isValid(); } - void Clear() - { - unbind(); - } - }; - - SvStream& operator << (SvStream &rStream, const ONDXPagePtr&); - SvStream& operator >> (SvStream &rStream, ONDXPagePtr&); - } -} -#endif #endif // _CONNECTIVITY_DBASE_INDEXPAGE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |