outmap.cxx (9f62ea84) outmap.cxx (47a7c0c1)
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

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

1653 DBG_CHKOBJ( &rDeviceRegion, Region, ImplDbgTestRegion );
1654
1655 RegionType eType = rDeviceRegion.GetType();
1656
1657 if ( !mbMap || (eType == REGION_EMPTY) || (eType == REGION_NULL) )
1658 return rDeviceRegion;
1659
1660 Region aRegion;
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

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

1653 DBG_CHKOBJ( &rDeviceRegion, Region, ImplDbgTestRegion );
1654
1655 RegionType eType = rDeviceRegion.GetType();
1656
1657 if ( !mbMap || (eType == REGION_EMPTY) || (eType == REGION_NULL) )
1658 return rDeviceRegion;
1659
1660 Region aRegion;
1661 PolyPolygon* pPolyPoly = rDeviceRegion.ImplGetImplRegion()->mpPolyPoly;
1661 basegfx::B2DPolyPolygon* pB2DPolyPoly = rDeviceRegion.ImplGetImplRegion()->mpB2DPolyPoly;
1662 PolyPolygon* pPolyPoly = pB2DPolyPoly ? 0 : rDeviceRegion.ImplGetImplRegion()->mpPolyPoly;
1662
1663
1663 if ( pPolyPoly )
1664 if ( pB2DPolyPoly ) // conversion with B2DPolyPolygon lost polygon-based ClipRegion
1665 {
1666 aRegion = Region( PixelToLogic( *pB2DPolyPoly ) );
1667 }
1668 else if ( pPolyPoly )
1669 {
1664 aRegion = Region( PixelToLogic( *pPolyPoly ) );
1670 aRegion = Region( PixelToLogic( *pPolyPoly ) );
1671 }
1665 else
1666 {
1667 long nX;
1668 long nY;
1669 long nWidth;
1670 long nHeight;
1671 ImplRegionInfo aInfo;
1672 sal_Bool bRegionRect;

--- 831 unchanged lines hidden --- 		1672 else
1673 {
1674 long nX;
1675 long nY;
1676 long nWidth;
1677 long nHeight;
1678 ImplRegionInfo aInfo;
1679 sal_Bool bRegionRect;

--- 831 unchanged lines hidden ---