diff -cNr old/svx/source/dialog/tpline.cxx new/svx/source/dialog/tpline.cxx *** old/svx/source/dialog/tpline.cxx Fri Jul 6 15:34:32 2007 --- new/svx/source/dialog/tpline.cxx Wed Oct 17 11:53:28 2007 *************** *** 1807,1813 **** const Graphic* pGraphic = 0; Graphic aGraphic; String aGrfName; ! BOOL bDontSetSize=FALSE; BOOL bEnable=TRUE; if(nItemId >= MN_GALLERY_ENTRY) --- 1807,1813 ---- const Graphic* pGraphic = 0; Graphic aGraphic; String aGrfName; ! BOOL bResetSize = FALSE; BOOL bEnable=TRUE; if(nItemId >= MN_GALLERY_ENTRY) *************** *** 1825,1830 **** --- 1825,1831 ---- { SVX_TRACE(213,ByteString( "SVX_SYMBOLTYPE_BRUSHITEM") ); nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM; + bResetSize = TRUE; } SvxBmpItemInfo* pInfo = (SvxBmpItemInfo*)aGrfBrushItems.GetObject(nItemId - MN_GALLERY_ENTRY); pGraphic = pInfo->pBrushItem->GetGraphic(); *************** *** 1834,1839 **** --- 1835,1841 ---- case MN_SYMBOLS_AUTO: { pGraphic=&aAutoSymbolGraphic; + aAutoSymbolGraphic.SetPrefSize( Size(253,253) ); aSymbolSize=aAutoSymbolGraphic.GetPrefSize(); #if OSL_DEBUG_LEVEL > 1 ByteString aStr( "AutoSymbolSize is "); *************** *** 1842,1848 **** aStr.Append( ByteString::CreateFromInt32( aSymbolSize.Height() ) ); SVX_TRACE(213, aStr ); #endif - bDontSetSize=TRUE; bNewSize=false; //fr�here �nderungen gelten nicht in diesem Fall! nSymbolType=SVX_SYMBOLTYPE_AUTO; } --- 1844,1849 ---- *************** *** 1870,1875 **** --- 1871,1877 ---- if( !aGrfDlg.GetGraphic(aGraphic) ) pGraphic = &aGraphic; } + bResetSize = TRUE; } break; } *************** *** 1879,1885 **** Size aSize = SvxNumberFormat::GetGraphicSizeMM100(pGraphic); aSize = OutputDevice::LogicToLogic(aSize, MAP_100TH_MM, (MapUnit)ePoolUnit); aSymbolGraphic=*pGraphic; ! if(!bDontSetSize) { aSymbolSize=aSize; #if OSL_DEBUG_LEVEL > 1 --- 1881,1887 ---- Size aSize = SvxNumberFormat::GetGraphicSizeMM100(pGraphic); aSize = OutputDevice::LogicToLogic(aSize, MAP_100TH_MM, (MapUnit)ePoolUnit); aSymbolGraphic=*pGraphic; ! if( bResetSize ) { aSymbolSize=aSize; #if OSL_DEBUG_LEVEL > 1 *************** *** 1896,1902 **** { aSymbolGraphic=Graphic(); SVX_TRACE(213, ByteString( "setting empty graphic" ) ); ! if(!bDontSetSize) { SVX_TRACE(213, ByteString( "Size set to 0,0" ) ); aSymbolSize=Size(0,0); --- 1898,1904 ---- { aSymbolGraphic=Graphic(); SVX_TRACE(213, ByteString( "setting empty graphic" ) ); ! if( bResetSize ) { SVX_TRACE(213, ByteString( "Size set to 0,0" ) ); aSymbolSize=Size(0,0);