#96792# new methods for pasting tables

4 files changed, 26 insertions, 10 deletions

diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 3c1563c76cc7..65195dacd53e 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DExport.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-23 11:30:20 $
+ *  last change: $Author: oj $ $Date: 2002-05-28 08:37:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -194,6 +194,7 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows,
     ,m_vFormatKey(0)
     ,m_vColumns(_rColumnPositions)
     ,m_bFoundTable(sal_False)
+    ,m_bCheckOnly(sal_False)
 {
     DBG_CTOR(ODatabaseExport,NULL);
 
@@ -247,6 +248,7 @@ ODatabaseExport::ODatabaseExport(const Reference< XConnection >& _rxConnection,
     ,m_xFactory(_rM)
     ,m_pTypeInfo(NULL)
     ,m_bFoundTable(sal_False)
+    ,m_bCheckOnly(sal_False)
 {
     DBG_CTOR(ODatabaseExport,NULL);
     try
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index daa5bf6d9f34..84958c59d620 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HtmlReader.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-23 12:03:56 $
+ *  last change: $Author: oj $ $Date: 2002-05-28 08:39:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -324,7 +324,7 @@ void OHTMLReader::NextToken( int nToken )
                 }
             case HTML_THEAD_ON:
             case HTML_TBODY_ON:
-                if(!m_xTable.is()) // erste Zeile als Header verwenden
+                if ( !m_xTable.is() ) // erste Zeile als Header verwenden
                     m_bError = !CreateTable(nToken);
                 break;
             case HTML_TABLE_OFF:
@@ -652,12 +652,19 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
 
     if(aColumnName.Len())
         CreateDefaultColumn(aColumnName);
+
+    if ( m_vDestVector.empty() )
+        return sal_False;
+
     if(!aTableName.Len())
         aTableName = aTempName;
 
     m_bInTbl        = sal_False;
     m_bFoundTable   = sal_True;
 
+    if ( isCheckEnabled() )
+        return sal_True;
+
     return !executeWizard(aTableName,makeAny(nTextColor),aFont) && m_xTable.is();
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index 3f71fd5b961e..b37ef3768e5e 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RtfReader.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-23 12:03:56 $
+ *  last change: $Author: oj $ $Date: 2002-05-28 08:41:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -418,13 +418,14 @@ sal_Bool ORTFReader::CreateTable(int nToken)
     sal_Bool bOk = !m_vDestVector.empty();
     if(bOk)
     {
-
         if(aColumnName.Len())
             CreateDefaultColumn(aColumnName);
 
         m_bInTbl        = sal_False;
         m_bFoundTable   = sal_True;
 
+        if ( isCheckEnabled() )
+            return sal_True;
         Any aTextColor;
         if(!m_vecColor.empty())
             aTextColor <<= m_vecColor[0];
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index dae8645cf4e6..75f3b6da9579 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TokenWriter.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2001-11-23 14:51:40 $
+ *  last change: $Author: oj $ $Date: 2002-05-28 08:41:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -184,6 +184,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ODataAccessDescriptor& _aData
     ,m_xFactory(_rM)
     ,m_nCommandType(CommandType::TABLE)
     ,m_bDisposeConnection(sal_False)
+    ,m_bCheckOnly(sal_False)
 {
 
     DBG_CTOR(ODatabaseImportExport,NULL);
@@ -222,6 +223,7 @@ ODatabaseImportExport::ODatabaseImportExport(   const ::com::sun::star::uno::Ref
     ,m_nCommandType(::com::sun::star::sdb::CommandType::TABLE)
     ,m_bDisposeConnection(sal_False)
     ,m_bInInitialize(sal_False)
+    ,m_bCheckOnly(sal_False)
 {
     DBG_CTOR(ODatabaseImportExport,NULL);
 }
@@ -599,6 +601,8 @@ BOOL ORTFImportExport::Read()
 {
     m_pReader = new ORTFReader((*m_pStream),m_xConnection,m_xFormatter,m_xFactory);
     ((ORTFReader*)m_pReader)->AddRef();
+    if ( isCheckEnabled() )
+        m_pReader->enableCheckOnly();
     SvParserState eState = ((ORTFReader*)m_pReader)->CallParser();
     m_pReader->release();
     m_pReader = NULL;
@@ -669,6 +673,8 @@ BOOL OHTMLImportExport::Read()
 {
     m_pReader = new OHTMLReader((*m_pStream),m_xConnection,m_xFormatter,m_xFactory);
     ((OHTMLReader*)m_pReader)->AddRef();
+    if ( isCheckEnabled() )
+        m_pReader->enableCheckOnly();
     SvParserState eState = ((OHTMLReader*)m_pReader)->CallParser();
     m_pReader->release();
     m_pReader = NULL;