SelectionAnalyzer.cxx (03e5ec27) | SelectionAnalyzer.cxx (c9c475c9) |
---|---|
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 --- 108 unchanged lines hidden (view full) --- 117 eContext = EnumContext::Context_MasterPage; 118 else 119 eContext = EnumContext::Context_DrawPage; 120 break; 121 122 case 1: 123 { 124 SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); | 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 --- 108 unchanged lines hidden (view full) --- 117 eContext = EnumContext::Context_MasterPage; 118 else 119 eContext = EnumContext::Context_DrawPage; 120 break; 121 122 case 1: 123 { 124 SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); |
125 if ( pObj->ISA(SdrTextObj) && ((SdrTextObj*)pObj)->IsInEditMode() ) | 125 if (pObj->ISA(SdrTextObj) && ((SdrTextObj*)pObj)->IsInEditMode()) |
126 { | 126 { |
127 eContext = EnumContext::Context_DrawText; | 127 if (pObj->GetObjIdentifier() == OBJ_TABLE) 128 { 129 // Let a table object take precedence over text 130 // edit mode. The panels for text editing are 131 // present for table context as well, anyway. 132 eContext = EnumContext::Context_Table; 133 } 134 else 135 eContext = EnumContext::Context_DrawText; |
128 } 129 else 130 { 131 const sal_uInt32 nInv = pObj->GetObjInventor(); 132 sal_uInt16 nObjId = pObj->GetObjIdentifier(); 133 if (nInv == SdrInventor) 134 { 135 if (nObjId == OBJ_GRUP) --- 341 unchanged lines hidden --- | 136 } 137 else 138 { 139 const sal_uInt32 nInv = pObj->GetObjInventor(); 140 sal_uInt16 nObjId = pObj->GetObjIdentifier(); 141 if (nInv == SdrInventor) 142 { 143 if (nObjId == OBJ_GRUP) --- 341 unchanged lines hidden --- |