drwbassh.cxx (efeef26f) drwbassh.cxx (ee093554)
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

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

377 pSh->EndUndo( UNDO_INSFMTATTR );
378
379 pSh->EndAllAction();
380 }
381 delete pDlg;
382
383 }
384 }
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

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

377 pSh->EndUndo( UNDO_INSFMTATTR );
378
379 pSh->EndAllAction();
380 }
381 delete pDlg;
382
383 }
384 }
385 else
386 {
387 pSdrView->SetGeoAttrToMarked( *pArgs );
388 }
385 }
386 }
387 break;
388
389 case SID_DELETE:
390 case FN_BACKSPACE:
391 if (pSh->IsObjSelected() && !pSdrView->IsTextEdit())
392 {

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

765 }
766 }
767 break;
768 }
769 nWhich = aIter.NextWhich();
770 }
771}
772
389 }
390 }
391 break;
392
393 case SID_DELETE:
394 case FN_BACKSPACE:
395 if (pSh->IsObjSelected() && !pSdrView->IsTextEdit())
396 {

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

769 }
770 }
771 break;
772 }
773 nWhich = aIter.NextWhich();
774 }
775}
776
773/*--------------------------------------------------------------------
774 Beschreibung:
775 --------------------------------------------------------------------*/
776
777
778void SwDrawBaseShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet )
779{
780 SwWrtShell *pSh = &GetShell();
781 SdrView* pSdrView = pSh->GetDrawView();
782 const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
783 if( rMarkList.GetMark(0) != 0 )
784 {
785 SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();//OST_IFBX@WL2
786 SfxItemSet aNewAttr(pSdrView->GetGeoAttrFromMarked());
787 rSet.Put(aNewAttr,false);
788 }
789}
777
790
791
778sal_Bool SwDrawBaseShell::Disable(SfxItemSet& rSet, sal_uInt16 nWhich)
779{
780 sal_Bool bDisable = GetShell().IsSelObjProtected(FLYPROTECT_CONTENT);
781
782 if (bDisable)
783 {
784 if (nWhich)
785 rSet.DisableItem( nWhich );

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

985 }
986
987 if (pValidation->nMaxWidth < pValidation->nWidth)
988 pValidation->nWidth = pValidation->nMaxWidth;
989 if (pValidation->nMaxHeight < pValidation->nHeight)
990 pValidation->nHeight = pValidation->nMaxHeight;
991 return 0;
992}
792sal_Bool SwDrawBaseShell::Disable(SfxItemSet& rSet, sal_uInt16 nWhich)
793{
794 sal_Bool bDisable = GetShell().IsSelObjProtected(FLYPROTECT_CONTENT);
795
796 if (bDisable)
797 {
798 if (nWhich)
799 rSet.DisableItem( nWhich );

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

999 }
1000
1001 if (pValidation->nMaxWidth < pValidation->nWidth)
1002 pValidation->nWidth = pValidation->nMaxWidth;
1003 if (pValidation->nMaxHeight < pValidation->nHeight)
1004 pValidation->nHeight = pValidation->nMaxHeight;
1005 return 0;
1006}
993
994
995
996