dbmgr.cxx (43f0f119) dbmgr.cxx (8ef2f12b)
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

--- 490 unchanged lines hidden (view full) ---

499 SwWait *pWait = 0;
500
501 {
502 sal_uLong i = 0;
503 do {
504
505 ImportDBEntry(pSh);
506 if( 10 == ++i )
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

--- 490 unchanged lines hidden (view full) ---

499 SwWait *pWait = 0;
500
501 {
502 sal_uLong i = 0;
503 do {
504
505 ImportDBEntry(pSh);
506 if( 10 == ++i )
507 pWait = new SwWait( *pSh->GetView().GetDocShell(), sal_True);
507 pWait = new SwWait( *pSh->GetView().GetDocShell(), true );
508
509 } while(ToNextMergeRecord());
510 }
511
512 pSh->DoGroupUndo(bGroupUndo);
513 pSh->EndUndo(UNDO_EMPTY);
514 pSh->EndAllAction();
515 delete pWait;

--- 2595 unchanged lines hidden --- 		508
509 } while(ToNextMergeRecord());
510 }
511
512 pSh->DoGroupUndo(bGroupUndo);
513 pSh->EndUndo(UNDO_EMPTY);
514 pSh->EndAllAction();
515 delete pWait;

--- 2595 unchanged lines hidden ---