strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#96479# add table to filter

Browse source
This commit is contained in:
Ocke Janssen 2002-07-05 12:55:05 +00:00
parent 31afb30ac7
commit da0a5f9920
3 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dbaccess/source/ui/inc/WCPage.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: WCPage.hxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: oj $ $Date: 2001-12-07 13:12:29 $
* last change: $Author: oj $ $Date: 2002-07-05 13:55:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -125,13 +125,13 @@ namespace dbaui
virtual BOOL LeavePage();
virtual String GetTitle() const ;
OCopyTable( Window * pParent, EImportMode atWhat, BOOL bIsQuery, OCopyTableWizard::Wizard_Create_Style nLastAction );
OCopyTable( Window * pParent, EImportMode atWhat, BOOL bIsView, OCopyTableWizard::Wizard_Create_Style nLastAction );
virtual ~OCopyTable();
BOOL IsOptionDefData() const { return m_aRB_DefData.IsChecked(); }
BOOL IsOptionDef() const { return m_aRB_Def.IsChecked(); }
BOOL IsOptionAppendData() const { return m_aRB_AppendData.IsChecked(); }
BOOL IsOptionView() const { return m_aRB_View.IsChecked(); }
inline BOOL IsOptionDefData() const { return m_aRB_DefData.IsChecked(); }
inline BOOL IsOptionDef() const { return m_aRB_Def.IsChecked(); }
inline BOOL IsOptionAppendData() const { return m_aRB_AppendData.IsChecked(); }
inline BOOL IsOptionView() const { return m_aRB_View.IsChecked(); }
};
}

14
dbaccess/source/ui/misc/HtmlReader.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: HtmlReader.cxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: oj $ $Date: 2002-05-28 08:39:10 $
* last change: $Author: oj $ $Date: 2002-07-05 13:52:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -334,7 +334,10 @@ void OHTMLReader::NextToken( int nToken )
}
break;
case HTML_TABLEROW_ON:
m_xResultSetUpdate->moveToInsertRow(); // sonst neue Zeile anh"angen
if ( m_xResultSetUpdate.is() )
m_xResultSetUpdate->moveToInsertRow(); // sonst neue Zeile anh"angen
else
m_bError = sal_True;
break;
case HTML_TEXTTOKEN:
case HTML_SINGLECHAR:
@ -353,6 +356,11 @@ void OHTMLReader::NextToken( int nToken )
}
break;
case HTML_TABLEROW_OFF:
if ( !m_xResultSetUpdate.is() )
{
m_bError = sal_True;
break;
}
try
{
m_nRowCount++;

10
dbaccess/source/ui/misc/WCPage.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: WCPage.cxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: oj $ $Date: 2002-05-23 12:03:56 $
* last change: $Author: oj $ $Date: 2002-07-05 13:52:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -115,7 +115,7 @@ using namespace ::com::sun::star::sdbcx;
//========================================================================
DBG_NAME(OCopyTable);
//------------------------------------------------------------------------
OCopyTable::OCopyTable( Window * pParent, EImportMode atWhat, sal_Bool bIsQuery, OCopyTableWizard::Wizard_Create_Style nLastAction )
OCopyTable::OCopyTable( Window * pParent, EImportMode atWhat, sal_Bool bIsView, OCopyTableWizard::Wizard_Create_Style nLastAction )
: OWizardPage( pParent, ModuleRes(TAB_WIZ_COPYTABLE) ),
m_ftTableName( this, ResId( FT_TABLENAME ) ),
m_edTableName( this, ResId( ET_TABLENAME ) ),
@ -129,7 +129,7 @@ OCopyTable::OCopyTable( Window * pParent, EImportMode atWhat, sal_Bool bIsQuery,
m_edKeyName( this, ResId( ET_KEYNAME ) ),
m_pPage2(NULL),
m_pPage3(NULL),
m_bIsViewAllowed(bIsQuery)
m_bIsViewAllowed(bIsView)
{
DBG_CTOR(OCopyTable,NULL);
@ -166,7 +166,7 @@ OCopyTable::OCopyTable( Window * pParent, EImportMode atWhat, sal_Bool bIsQuery,
}
}
if(!m_bIsViewAllowed)
if ( !m_bIsViewAllowed || bIsView ) // if it is a view disable the view checkbox #100644# OJ
m_aRB_View.Disable();
//////////////////////////////////////////////////////////////////////