Kaydet (Commit) f826a5b5 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

quick and ugly hack for ScEditableTester in ucalc

Fix this as soon as possible with a clean fix
üst 82f5a3b5
...@@ -419,6 +419,10 @@ private: ...@@ -419,6 +419,10 @@ private:
::std::set<ScFormulaCell*> maSubTotalCells; ::std::set<ScFormulaCell*> maSubTotalCells;
// quick and ugly hack to fix the ScEditableTester problem in ucalc
// write a clean fix for this as soon as possible
bool mbIsInTest;
public: public:
SC_DLLPUBLIC sal_uLong GetCellCount() const; // all cells SC_DLLPUBLIC sal_uLong GetCellCount() const; // all cells
SCSIZE GetCellCount(SCTAB nTab, SCCOL nCol) const; SCSIZE GetCellCount(SCTAB nTab, SCCOL nCol) const;
...@@ -1103,6 +1107,7 @@ public: ...@@ -1103,6 +1107,7 @@ public:
bool bColInfo = false, bool bRowInfo = false ); bool bColInfo = false, bool bRowInfo = false );
SC_DLLPUBLIC void InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection, SC_DLLPUBLIC void InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection,
bool bColInfo = false, bool bRowInfo = false ); bool bColInfo = false, bool bRowInfo = false );
void SetInTest() { mbIsInTest = true; }
// don't use anymore: // don't use anymore:
void CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, void CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
......
...@@ -4766,7 +4766,8 @@ bool ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, ...@@ -4766,7 +4766,8 @@ bool ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
{ {
// import into read-only document is possible // import into read-only document is possible
if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && pShell->IsReadOnly() ) // TODO: come up with a clean solution for the testing problem
if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && (pShell->IsReadOnly()&&!mbIsInTest) )
{ {
if ( pOnlyNotBecauseOfMatrix ) if ( pOnlyNotBecauseOfMatrix )
*pOnlyNotBecauseOfMatrix = false; *pOnlyNotBecauseOfMatrix = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment