diff options
Diffstat (limited to 'sd/source/ui/func/fuinsert.cxx')
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 74eb6756c..0f1d62ea7 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -43,7 +43,7 @@ #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> - +#include <sfx2/msgpool.hxx> #include <svtools/sores.hxx> #include <svtools/insdlg.hxx> #include <sfx2/request.hxx> @@ -169,7 +169,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& ) } else { - SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); + SdGRFFilter::HandleGraphicFilterError( (sal_uInt16)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); } } } @@ -204,7 +204,7 @@ FunctionReference FuInsertClipboard::Create( ViewShell* pViewSh, ::sd::Window* p void FuInsertClipboard::DoExecute( SfxRequest& ) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpWindow ) ); - ULONG nFormatId; + sal_uLong nFormatId; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( mpViewShell->GetActiveWindow() ); @@ -233,7 +233,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& ) if( !mpView->InsertData( aDataHelper, mpWindow->PixelToLogic( Rectangle( Point(), mpWindow->GetOutputSizePixel() ).Center() ), - nAction, FALSE, nFormatId ) && + nAction, sal_False, nFormatId ) && ( mpViewShell && mpViewShell->ISA( DrawViewShell ) ) ) { DrawViewShell* pDrViewSh = static_cast<DrawViewShell*>(mpViewShell); @@ -374,7 +374,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) bool bRet = true; if( pPickObj ) - mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, TRUE ); + mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, sal_True ); else bRet = mpView->InsertObjectAtView(pOleObj, *pPV, SDRINSERT_SETDEFLAYER); @@ -422,7 +422,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) * Objekt einfuegen **********************************************************************/ sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - BOOL bCreateNew = FALSE; + sal_Bool bCreateNew = sal_False; uno::Reference < embed::XEmbeddedObject > xObj; uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); SvObjectServerList aServerLst; @@ -457,12 +457,11 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) // intentionally no break! } case SID_INSERT_PLUGIN : - case SID_INSERT_APPLET : case SID_INSERT_FLOATINGFRAME : { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractInsertObjectDialog* pDlg = - pFact->CreateInsertObjectDialog( mpViewShell->GetActiveWindow(), nSlotId, + pFact->CreateInsertObjectDialog( mpViewShell->GetActiveWindow(), SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommandString(), xStorage, &aServerLst ); if ( pDlg ) { @@ -531,9 +530,9 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { //TODO/LATER: needs status for RESIZEONPRINTERCHANGE //if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xObj->getStatus( nAspect ) ) - // aIPObj->OnDocumentPrinterChanged( mpDocSh->GetPrinter(FALSE) ); + // aIPObj->OnDocumentPrinterChanged( mpDocSh->GetPrinter(sal_False) ); - BOOL bInsertNewObject = TRUE; + sal_Bool bInsertNewObject = sal_True; Size aSize; MapUnit aMapUnit = MAP_100TH_MM; @@ -588,8 +587,8 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) /************************************************** * Das leere OLE-Objekt bekommt ein neues IPObj **************************************************/ - bInsertNewObject = FALSE; - pObj->SetEmptyPresObj(FALSE); + bInsertNewObject = sal_False; + pObj->SetEmptyPresObj(sal_False); ( (SdrOle2Obj*) pObj)->SetOutlinerParaObject(NULL); ( (SdrOle2Obj*) pObj)->SetObjRef(xObj); ( (SdrOle2Obj*) pObj)->SetPersistName(aName); |