diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-11-21 14:23:32 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-11-22 09:07:21 -0500 |
| commit | e8fe1e2e7fcbfc36559429afdfdbed149259e42f (patch) | |
| tree | 83231a9d531b2c1aafccdf9706dba6f1122bdd74 /sc | |
| parent | 173dfb3f2e3c07b35fa05a218d9860720850a6a3 (diff) | |
Call the method directly via ScDocument, not via obscure UNO API.
Change-Id: I27628314337ae4df31420d63d7c09148369a6759
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/document.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/column2.cxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 68e57d2900c6..80d724b186a8 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1920,7 +1920,7 @@ public: void CompileDBFormula(); void CompileDBFormula( bool bCreateFormulaString ); - void CompileNameFormula( bool bCreateFormulaString ); + SC_DLLPUBLIC void CompileNameFormula( bool bCreateFormulaString ); void CompileColRowNameFormula(); /** Maximum string length of a column, e.g. for dBase export. diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 240677b55fa1..65d6c884126f 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -3198,7 +3198,6 @@ void ScColumn::CompileNameFormula( bool bCreateFormulaString ) { CompileNameFormulaHandler aFunc(bCreateFormulaString); sc::ProcessFormula(maCells, aFunc); - RegroupFormulaCells(); } void ScColumn::CompileColRowNameFormula() diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 31dd5bdae4cd..a27998ea33ee 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -628,10 +628,8 @@ void WorkbookGlobals::finalize() PropertySet aPropSet( mxDoc ); // #i74668# do not insert default sheets aPropSet.setProperty( PROP_IsLoaded, true ); - // #i79890# enable automatic update of defined names (before IsAdjustHeightEnabled!) - Reference< XActionLockable > xLockable( aPropSet.getAnyProperty( PROP_NamedRanges ), UNO_QUERY ); - if( xLockable.is() ) - xLockable->removeActionLock(); + // #i79890# Compile named ranges before re-enabling row height adjustment. (no idea why). + mpDoc->CompileNameFormula(false); // enable automatic update of linked sheets and DDE links aPropSet.setProperty( PROP_IsExecuteLinkEnabled, true ); // #i79826# enable updating automatic row height after loading the document |