fldref.cxx (efeef26f) fldref.cxx (dec99bbd)
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

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

508{
509 SwWrtShell *pSh = GetWrtShell();
510 if(!pSh)
511 pSh = ::GetActiveWrtShell();
512 SwGetRefField* pRefFld = (SwGetRefField*)GetCurField();
513 const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel());
514
515 String sOldSel;
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

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

508{
509 SwWrtShell *pSh = GetWrtShell();
510 if(!pSh)
511 pSh = ::GetActiveWrtShell();
512 SwGetRefField* pRefFld = (SwGetRefField*)GetCurField();
513 const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel());
514
515 String sOldSel;
516 // --> OD 2007-11-22 #i83479#
517 if ( aSelectionLB.IsVisible() )
518 {
519 const sal_uInt16 nSelectionSel = aSelectionLB.GetSelectEntryPos();
520 if (nSelectionSel != LISTBOX_ENTRY_NOTFOUND)
521 {
522 sOldSel = aSelectionLB.GetEntry(nSelectionSel);
523 }
524 }
516 if ( aSelectionLB.IsVisible() )
517 {
518 const sal_uInt16 nSelectionSel = aSelectionLB.GetSelectEntryPos();
519 if (nSelectionSel != LISTBOX_ENTRY_NOTFOUND)
520 {
521 sOldSel = aSelectionLB.GetEntry(nSelectionSel);
522 }
523 }
525 // <--
526 if (IsFldEdit() && !sOldSel.Len())
527 sOldSel = String::CreateFromInt32( pRefFld->GetSeqNo() + 1 );
528
529 aSelectionLB.SetUpdateMode(sal_False);
530 aSelectionLB.Clear();
524 if (IsFldEdit() && !sOldSel.Len())
525 sOldSel = String::CreateFromInt32( pRefFld->GetSeqNo() + 1 );
526
527 aSelectionLB.SetUpdateMode(sal_False);
528 aSelectionLB.Clear();
531 // --> OD 2007-11-21 #i83479#
532 aSelectionToolTipLB.SetUpdateMode(sal_False);
533 aSelectionToolTipLB.Clear();
534 bool bShowSelectionToolTipLB( false );
529 aSelectionToolTipLB.SetUpdateMode(sal_False);
530 aSelectionToolTipLB.Clear();
531 bool bShowSelectionToolTipLB( false );
535 // <--
536
537 if( REFFLDFLAG & nTypeId )
538 {
539 if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken!
540 {
541 aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT);
542 // alle Textmarken besorgen
543 IDocumentMarkAccess* const pMarkAccess = pSh->getIDocumentMarkAccess();

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

573
574 for( sal_uInt16 n = 0; n < nCnt; ++n )
575 {
576 aSelectionLB.InsertEntry( aArr[ n ]->sDlgEntry );
577 if (IsFldEdit() && pRefFld->GetSeqNo() == aArr[ n ]->nSeqNo)
578 sOldSel = aArr[n]->sDlgEntry;
579 }
580 }
532
533 if( REFFLDFLAG & nTypeId )
534 {
535 if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken!
536 {
537 aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT);
538 // alle Textmarken besorgen
539 IDocumentMarkAccess* const pMarkAccess = pSh->getIDocumentMarkAccess();

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

569
570 for( sal_uInt16 n = 0; n < nCnt; ++n )
571 {
572 aSelectionLB.InsertEntry( aArr[ n ]->sDlgEntry );
573 if (IsFldEdit() && pRefFld->GetSeqNo() == aArr[ n ]->nSeqNo)
574 sOldSel = aArr[n]->sDlgEntry;
575 }
576 }
581 // --> OD 2007-11-14 #i83479#
582 else if ( nTypeId == REFFLDFLAG_HEADING )
583 {
584 bShowSelectionToolTipLB = true;
585
586 const IDocumentOutlineNodes* pIDoc( pSh->getIDocumentOutlineNodesAccess() );
587 pIDoc->getOutlineNodes( maOutlineNodes );
588 bool bCertainTxtNodeSelected( false );
589 SvLBoxEntry* pEntry = 0;

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

634 else if ( !bCertainTxtNodeSelected &&
635 GetSavedSelectedPos() == nNumItemIdx )
636 {
637 aSelectionToolTipLB.Select( pEntry );
638 sOldSel.Erase();
639 }
640 }
641 }
577 else if ( nTypeId == REFFLDFLAG_HEADING )
578 {
579 bShowSelectionToolTipLB = true;
580
581 const IDocumentOutlineNodes* pIDoc( pSh->getIDocumentOutlineNodesAccess() );
582 pIDoc->getOutlineNodes( maOutlineNodes );
583 bool bCertainTxtNodeSelected( false );
584 SvLBoxEntry* pEntry = 0;

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

629 else if ( !bCertainTxtNodeSelected &&
630 GetSavedSelectedPos() == nNumItemIdx )
631 {
632 aSelectionToolTipLB.Select( pEntry );
633 sOldSel.Erase();
634 }
635 }
636 }
642 // <--
643 else
644 {
645 aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT);
646 // zum Seq-FeldTyp die Felder besorgen:
647
648 SwSetExpFieldType* pType = (SwSetExpFieldType*)pSh->GetFldType(
649 nTypeId & ~REFFLDFLAG, RES_SETEXPFLD );
650 if( pType )

--- 419 unchanged lines hidden ---
637 else
638 {
639 aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT);
640 // zum Seq-FeldTyp die Felder besorgen:
641
642 SwSetExpFieldType* pType = (SwSetExpFieldType*)pSh->GetFldType(
643 nTypeId & ~REFFLDFLAG, RES_SETEXPFLD );
644 if( pType )

--- 419 unchanged lines hidden ---