redlndlg.cxx (becb7dab) redlndlg.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

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

140
141 if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
142 return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
143
144 SwDocShell *pDocSh = pView->GetDocShell();
145
146 if (pChildWin->GetOldDocShell() != pDocSh)
147 { // Dok-Wechsel
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

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

140
141 if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
142 return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
143
144 SwDocShell *pDocSh = pView->GetDocShell();
145
146 if (pChildWin->GetOldDocShell() != pDocSh)
147 { // Dok-Wechsel
148 SwWait aWait( *pDocSh, sal_False );
148 SwWait aWait( *pDocSh, false );
149 SwWrtShell* pSh = pView->GetWrtShellPtr();
150
151 pChildWin->SetOldDocShell(pDocSh); // Rekursion vermeiden (durch Modified-Hdl)
152
153 sal_Bool bMod = pSh->IsModified();
154 SfxBoolItem aShow(FN_REDLINE_SHOW, sal_True);
155 pSh->GetView().GetViewFrame()->GetDispatcher()->Execute(
156 FN_REDLINE_SHOW, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aShow, 0L);

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

305}
306
307/*------------------------------------------------------------------------
308 Beschreibung:
309------------------------------------------------------------------------*/
310
311void SwRedlineAcceptDlg::Init(sal_uInt16 nStart)
312{
149 SwWrtShell* pSh = pView->GetWrtShellPtr();
150
151 pChildWin->SetOldDocShell(pDocSh); // Rekursion vermeiden (durch Modified-Hdl)
152
153 sal_Bool bMod = pSh->IsModified();
154 SfxBoolItem aShow(FN_REDLINE_SHOW, sal_True);
155 pSh->GetView().GetViewFrame()->GetDispatcher()->Execute(
156 FN_REDLINE_SHOW, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aShow, 0L);

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

305}
306
307/*------------------------------------------------------------------------
308 Beschreibung:
309------------------------------------------------------------------------*/
310
311void SwRedlineAcceptDlg::Init(sal_uInt16 nStart)
312{
313 SwWait aWait( *::GetActiveView()->GetDocShell(), sal_False );
313 SwWait aWait( *::GetActiveView()->GetDocShell(), false );
314 pTable->SetUpdateMode(sal_False);
315 aUsedSeqNo.Remove((sal_uInt16)0, aUsedSeqNo.Count());
316
317 if (nStart)
318 RemoveParents(nStart, aRedlineParents.Count() - 1);
319 else
320 {
321 pTable->Clear();

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

475
476void SwRedlineAcceptDlg::Activate()
477{
478 // prevent update if flag is set (#102547#)
479 if( bInhibitActivate )
480 return;
481
482 SwView *pView = ::GetActiveView();
314 pTable->SetUpdateMode(sal_False);
315 aUsedSeqNo.Remove((sal_uInt16)0, aUsedSeqNo.Count());
316
317 if (nStart)
318 RemoveParents(nStart, aRedlineParents.Count() - 1);
319 else
320 {
321 pTable->Clear();

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

475
476void SwRedlineAcceptDlg::Activate()
477{
478 // prevent update if flag is set (#102547#)
479 if( bInhibitActivate )
480 return;
481
482 SwView *pView = ::GetActiveView();
483 SwWait aWait( *pView->GetDocShell(), sal_False );
483 SwWait aWait( *pView->GetDocShell(), false );
484
485 aUsedSeqNo.Remove((sal_uInt16)0, aUsedSeqNo.Count());
486
487 if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
488 return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
489
490/* if (HasRedlineAutoFmt())
491 {

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

917
918 pEntry = bSelect ? pTable->NextSelected(pEntry) : pTable->Next(pEntry);
919 }
920
921 sal_Bool (SwEditShell:: *FnAccRej)( sal_uInt16 ) = &SwEditShell::AcceptRedline;
922 if( !bAccept )
923 FnAccRej = &SwEditShell::RejectRedline;
924
484
485 aUsedSeqNo.Remove((sal_uInt16)0, aUsedSeqNo.Count());
486
487 if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
488 return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
489
490/* if (HasRedlineAutoFmt())
491 {

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

917
918 pEntry = bSelect ? pTable->NextSelected(pEntry) : pTable->Next(pEntry);
919 }
920
921 sal_Bool (SwEditShell:: *FnAccRej)( sal_uInt16 ) = &SwEditShell::AcceptRedline;
922 if( !bAccept )
923 FnAccRej = &SwEditShell::RejectRedline;
924
925 SwWait aWait( *pSh->GetView().GetDocShell(), sal_True );
925 SwWait aWait( *pSh->GetView().GetDocShell(), true );
926 pSh->StartAction();
927
928 // #111827#
929 if (aRedlines.size() > 1)
930 {
931 String aTmpStr;
932 {
933 SwRewriter aRewriter;

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

1323
1324 nSortMode = nRet - MN_SORT_ACTION;
1325 if (nSortMode == 4)
1326 nSortMode = 0xffff; // unsortiert bzw sortiert nach Position
1327
1328 if (pTable->GetSortedCol() == nSortMode)
1329 bSortDir = !pTable->GetSortDirection();
1330
926 pSh->StartAction();
927
928 // #111827#
929 if (aRedlines.size() > 1)
930 {
931 String aTmpStr;
932 {
933 SwRewriter aRewriter;

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

1323
1324 nSortMode = nRet - MN_SORT_ACTION;
1325 if (nSortMode == 4)
1326 nSortMode = 0xffff; // unsortiert bzw sortiert nach Position
1327
1328 if (pTable->GetSortedCol() == nSortMode)
1329 bSortDir = !pTable->GetSortDirection();
1330
1331 SwWait aWait( *::GetActiveView()->GetDocShell(), sal_False );
1331 SwWait aWait( *::GetActiveView()->GetDocShell(), false );
1332 pTable->SortByCol(nSortMode, bSortDir);
1333 if (nSortMode == 0xffff)
1334 Init(); // Alles neu fuellen
1335 }
1336 break;
1337 }
1338 }
1339 break;

--- 65 unchanged lines hidden --- 		1332 pTable->SortByCol(nSortMode, bSortDir);
1333 if (nSortMode == 0xffff)
1334 Init(); // Alles neu fuellen
1335 }
1336 break;
1337 }
1338 }
1339 break;

--- 65 unchanged lines hidden ---