dbdocfun.cxx (57b4fa3c) | dbdocfun.cxx (a840a559) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 527 unchanged lines hidden (view full) --- 536 if (pDocDB->GetCount()) 537 pUndoDB = new ScDBCollection( *pDocDB ); 538 539 pUndoAction = new ScUndoSort( &rDocShell, nTab, rSortParam, bRepeatQuery, pUndoDoc, pUndoDB, pR ); 540 rDocShell.GetUndoManager()->AddUndoAction( pUndoAction ); 541 542 // #i59745# collect all drawing undo actions affecting cell note captions 543 if( pDrawLayer ) | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 527 unchanged lines hidden (view full) --- 536 if (pDocDB->GetCount()) 537 pUndoDB = new ScDBCollection( *pDocDB ); 538 539 pUndoAction = new ScUndoSort( &rDocShell, nTab, rSortParam, bRepeatQuery, pUndoDoc, pUndoDB, pR ); 540 rDocShell.GetUndoManager()->AddUndoAction( pUndoAction ); 541 542 // #i59745# collect all drawing undo actions affecting cell note captions 543 if( pDrawLayer ) |
544 pDrawLayer->BeginCalcUndo(); | 544 pDrawLayer->BeginCalcUndo(false); |
545 } 546 547 if ( bCopy ) 548 { 549 if (pDestData) 550 pDoc->DeleteAreaTab(aOldDest, IDF_CONTENTS); // Zielbereich vorher loeschen 551 552 ScRange aSource( rSortParam.nCol1,rSortParam.nRow1,nSrcTab, --- 952 unchanged lines hidden --- | 545 } 546 547 if ( bCopy ) 548 { 549 if (pDestData) 550 pDoc->DeleteAreaTab(aOldDest, IDF_CONTENTS); // Zielbereich vorher loeschen 551 552 ScRange aSource( rSortParam.nCol1,rSortParam.nRow1,nSrcTab, --- 952 unchanged lines hidden --- |