fucopy.cxx (79aad27f) | fucopy.cxx (c7be74b1) |
---|---|
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 --- 100 unchanged lines hidden (view full) --- 109 aSet.Put( aXColorItem ); 110 111 } 112 } 113 114 SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); 115 if( pFact ) 116 { | 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 --- 100 unchanged lines hidden (view full) --- 109 aSet.Put( aXColorItem ); 110 111 } 112 } 113 114 SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); 115 if( pFact ) 116 { |
117 AbstractCopyDlg* pDlg = pFact->CreateCopyDlg(NULL, aSet, mpDoc->GetColorTable(), mpView ); | 117 AbstractCopyDlg* pDlg = pFact->CreateCopyDlg(NULL, aSet, mpDoc->GetColorTableFromSdrModel(), mpView ); |
118 if( pDlg ) 119 { 120 sal_uInt16 nResult = pDlg->Execute(); 121 122 switch( nResult ) 123 { 124 case RET_OK: 125 pDlg->GetAttr( aSet ); --- 186 unchanged lines hidden --- | 118 if( pDlg ) 119 { 120 sal_uInt16 nResult = pDlg->Execute(); 121 122 switch( nResult ) 123 { 124 case RET_OK: 125 pDlg->GetAttr( aSet ); --- 186 unchanged lines hidden --- |