mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#85268# don't use the same tabledata again

Browse Source
This commit is contained in:
Ocke Janssen
2001-03-23 08:47:54 +00:00
parent e5616b75e1
commit b10b767ecb
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbaccess/source/ui/inc/QueryTableView.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: QueryTableView.hxx,v $ * $RCSfile: QueryTableView.hxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: oj $ $Date: 2001-02-28 10:10:01 $ * last change: $Author: oj $ $Date: 2001-03-23 09:47:54 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -144,7 +144,7 @@ namespace dbaui
void EnsureVisible(const OTableWindow* _pWin); void EnsureVisible(const OTableWindow* _pWin);
// wieviel Tabellen mit einem bestimmten Namen habe ich schon ? // wieviel Tabellen mit einem bestimmten Namen habe ich schon ?
USHORT CountTableAlias(const String& rName, USHORT& rMax); sal_Int32 CountTableAlias(const String& rName, sal_Int32& rMax);
// ein Feld einfuegen (wird einfach an das Elter weitergereicht // ein Feld einfuegen (wird einfach an das Elter weitergereicht
void InsertField(const OTableFieldDesc& rInfo); void InsertField(const OTableFieldDesc& rInfo);

8
dbaccess/source/ui/querydesign/QTableWindow.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: QTableWindow.hxx,v $ * $RCSfile: QTableWindow.hxx,v $
* *
* $Revision: 1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: oj $ $Date: 2001-02-05 09:33:13 $ * last change: $Author: oj $ $Date: 2001-03-23 09:46:40 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -79,7 +79,7 @@ namespace dbaui
//================================================================== //==================================================================
class OQueryTableWindow : public OTableWindow class OQueryTableWindow : public OTableWindow
{ {
USHORT m_nAliasNum; sal_Int32 m_nAliasNum;
::rtl::OUString m_strInitialAlias; ::rtl::OUString m_strInitialAlias;
public: public:
TYPEINFO(); TYPEINFO();
@@ -98,7 +98,7 @@ namespace dbaui
// spaeter Constructor, die Basisklasse ERZEUGT beim ersten Aufruf die Listbox // spaeter Constructor, die Basisklasse ERZEUGT beim ersten Aufruf die Listbox
virtual BOOL Init(); virtual BOOL Init();
USHORT GetAliasNum() const { return m_nAliasNum; } sal_Int32 GetAliasNum() const { return m_nAliasNum; }
BOOL ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDesc& rInfo); BOOL ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDesc& rInfo);
BOOL ExistsAVisitedConn() const; BOOL ExistsAVisitedConn() const;

26
dbaccess/source/ui/querydesign/QueryTableView.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: QueryTableView.cxx,v $ * $RCSfile: QueryTableView.cxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: fs $ $Date: 2001-03-15 08:26:26 $ * last change: $Author: oj $ $Date: 2001-03-23 09:46:40 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -203,10 +203,10 @@ OQueryTableView::~OQueryTableView()
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
sal_uInt16 OQueryTableView::CountTableAlias(const String& rName, sal_uInt16& rMax) sal_Int32 OQueryTableView::CountTableAlias(const String& rName, sal_Int32& rMax)
{ {
DBG_CHKTHIS(OQueryTableView,NULL); DBG_CHKTHIS(OQueryTableView,NULL);
sal_uInt16 nRet = 0; sal_Int32 nRet = 0;
OTableWindowMapIterator aIter = GetTabWinMap()->find(rName); OTableWindowMapIterator aIter = GetTabWinMap()->find(rName);
while(aIter != GetTabWinMap()->end()) while(aIter != GetTabWinMap()->end())
@@ -541,15 +541,15 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r
// first check if this already hav it's data // first check if this already hav it's data
sal_Bool bAppend = sal_True; sal_Bool bAppend = sal_True;
OQueryTableWindowData* pNewTabWinData = NULL; OQueryTableWindowData* pNewTabWinData = NULL;
::std::vector< OTableWindowData*>* pWindowData = getDesignView()->getController()->getTableWindowData(); // ::std::vector< OTableWindowData*>* pWindowData = getDesignView()->getController()->getTableWindowData();
::std::vector< OTableWindowData*>::iterator aWinIter = pWindowData->begin(); // ::std::vector< OTableWindowData*>::iterator aWinIter = pWindowData->begin();
for(;aWinIter != pWindowData->end();++aWinIter) // for(;aWinIter != pWindowData->end();++aWinIter)
{ // {
pNewTabWinData = PTR_CAST(OQueryTableWindowData, *aWinIter); // pNewTabWinData = PTR_CAST(OQueryTableWindowData, *aWinIter);
if (pNewTabWinData && pNewTabWinData->GetWinName() == strAlias && pNewTabWinData->GetComposedName() == _rComposedName && pNewTabWinData->GetTableName() == strTableName) // if (pNewTabWinData && pNewTabWinData->GetWinName() == strAlias && pNewTabWinData->GetComposedName() == _rComposedName && pNewTabWinData->GetTableName() == strTableName)
break; // break;
} // }
if(bAppend = (aWinIter == pWindowData->end())) // if(bAppend = (aWinIter == pWindowData->end()))
pNewTabWinData = new OQueryTableWindowData(_rComposedName, strTableName, strAlias); pNewTabWinData = new OQueryTableWindowData(_rComposedName, strTableName, strAlias);
// die TabWinData brauche ich nicht in die entsprechende Liste der DocShell eintragen, das macht ShowTabWin // die TabWinData brauche ich nicht in die entsprechende Liste der DocShell eintragen, das macht ShowTabWin