Skip to content

C
core
Kaydet (Commit) 0762f059 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

Call the method directly via ScDocument, not via obscure UNO API. 

Change-Id: I27628314337ae4df31420d63d7c09148369a6759
üst 79ceef87
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
sc/inc/document.hxx
Dosyayı görüntüle @ 0762f059
...@@ -1920,7 +1920,7 @@ public: ...@@ -1920,7 +1920,7 @@ public:
void CompileDBFormula(); void CompileDBFormula();
void CompileDBFormula( bool bCreateFormulaString ); void CompileDBFormula( bool bCreateFormulaString );
void CompileNameFormula( bool bCreateFormulaString ); SC_DLLPUBLIC void CompileNameFormula( bool bCreateFormulaString );
void CompileColRowNameFormula(); void CompileColRowNameFormula();
/** Maximum string length of a column, e.g. for dBase export. /** Maximum string length of a column, e.g. for dBase export.
......
sc/source/core/data/column2.cxx
Dosyayı görüntüle @ 0762f059
...@@ -3198,7 +3198,6 @@ void ScColumn::CompileNameFormula( bool bCreateFormulaString ) ...@@ -3198,7 +3198,6 @@ void ScColumn::CompileNameFormula( bool bCreateFormulaString )
{ {
CompileNameFormulaHandler aFunc(bCreateFormulaString); CompileNameFormulaHandler aFunc(bCreateFormulaString);
sc::ProcessFormula(maCells, aFunc); sc::ProcessFormula(maCells, aFunc);
RegroupFormulaCells();
} }
void ScColumn::CompileColRowNameFormula() void ScColumn::CompileColRowNameFormula()
......
sc/source/filter/oox/workbookhelper.cxx
Dosyayı görüntüle @ 0762f059
...@@ -628,10 +628,8 @@ void WorkbookGlobals::finalize() ...@@ -628,10 +628,8 @@ void WorkbookGlobals::finalize()
PropertySet aPropSet( mxDoc ); PropertySet aPropSet( mxDoc );
// #i74668# do not insert default sheets // #i74668# do not insert default sheets
aPropSet.setProperty( PROP_IsLoaded, true ); aPropSet.setProperty( PROP_IsLoaded, true );
// #i79890# enable automatic update of defined names (before IsAdjustHeightEnabled!) // #i79890# Compile named ranges before re-enabling row height adjustment. (no idea why).
Reference< XActionLockable > xLockable( aPropSet.getAnyProperty( PROP_NamedRanges ), UNO_QUERY ); mpDoc->CompileNameFormula(false);
if( xLockable.is() )
xLockable->removeActionLock();
// enable automatic update of linked sheets and DDE links // enable automatic update of linked sheets and DDE links
aPropSet.setProperty( PROP_IsExecuteLinkEnabled, true ); aPropSet.setProperty( PROP_IsExecuteLinkEnabled, true );
// #i79826# enable updating automatic row height after loading the document // #i79826# enable updating automatic row height after loading the document
......
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