gridwin.cxx (b3f79822) | gridwin.cxx (51b45b88) |
---|---|
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 --- 866 unchanged lines hidden (view full) --- 875 ScDocument* pDoc = pViewData->GetDocument(); 876 SCTAB nTab = pViewData->GetTabNo(); 877 sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); 878 879 long nSizeX = 0; 880 long nSizeY = 0; 881 long nHeight = 0; 882 pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY ); | 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 --- 866 unchanged lines hidden (view full) --- 875 ScDocument* pDoc = pViewData->GetDocument(); 876 SCTAB nTab = pViewData->GetTabNo(); 877 sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); 878 879 long nSizeX = 0; 880 long nSizeY = 0; 881 long nHeight = 0; 882 pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY ); |
883 // The button height should not use the merged cell height, should still use single row height 884 nSizeY = pViewData->ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY()); |
|
883 Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich ); 884 if ( bLayoutRTL ) 885 aPos.X() -= nSizeX; 886 887 Rectangle aCellRect( OutputToScreenPixel(aPos), Size(nSizeX,nSizeY) ); 888 889 aPos.X() -= 1; 890 aPos.Y() += nSizeY - 1; --- 778 unchanged lines hidden (view full) --- 1669 1670 1671 // 1672 // AutoFilter buttons 1673 // 1674 1675 if ( !bDouble && !bFormulaMode && rMEvt.IsLeft() ) 1676 { | 885 Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich ); 886 if ( bLayoutRTL ) 887 aPos.X() -= nSizeX; 888 889 Rectangle aCellRect( OutputToScreenPixel(aPos), Size(nSizeX,nSizeY) ); 890 891 aPos.X() -= 1; 892 aPos.Y() += nSizeY - 1; --- 778 unchanged lines hidden (view full) --- 1671 1672 1673 // 1674 // AutoFilter buttons 1675 // 1676 1677 if ( !bDouble && !bFormulaMode && rMEvt.IsLeft() ) 1678 { |
1679 SCsCOL nRealPosX; 1680 SCsROW nRealPosY; 1681 pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nRealPosX, nRealPosY, false );//the real row/col 1682 ScMergeFlagAttr* pRealPosAttr = (ScMergeFlagAttr*) 1683 pDoc->GetAttr( nRealPosX, nRealPosY, nTab, ATTR_MERGE_FLAG ); |
|
1677 ScMergeFlagAttr* pAttr = (ScMergeFlagAttr*) 1678 pDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG ); | 1684 ScMergeFlagAttr* pAttr = (ScMergeFlagAttr*) 1685 pDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG ); |
1679 if (pAttr->HasAutoFilter()) | 1686 if( pRealPosAttr->HasAutoFilter() ) |
1680 { | 1687 { |
1688 SC_MOD()->InputEnterHandler(); 1689 if (DoAutoFilterButton( nRealPosX, nRealPosY, rMEvt)) 1690 return; 1691 } 1692 if( pAttr->HasAutoFilter() ) 1693 { |
|
1681 SC_MOD()->InputEnterHandler(); //Add for i85305 | 1694 SC_MOD()->InputEnterHandler(); //Add for i85305 |
1682 if (DoAutoFilterButton(nPosX, nPosY, rMEvt)) | 1695 if (DoAutoFilterButton( nPosX, nPosY, rMEvt)) |
1683 return; 1684 } 1685 if (pAttr->HasButton()) 1686 { 1687 DoPushButton( nPosX, nPosY, rMEvt ); // setzt evtl. bPivotMouse / bDPMouse 1688 return; 1689 } 1690 --- 4033 unchanged lines hidden --- | 1696 return; 1697 } 1698 if (pAttr->HasButton()) 1699 { 1700 DoPushButton( nPosX, nPosY, rMEvt ); // setzt evtl. bPivotMouse / bDPMouse 1701 return; 1702 } 1703 --- 4033 unchanged lines hidden --- |