diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/draw/dpage.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/frmedt/fefly1.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/view/vprint.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dochdl/swdtflvr.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/inc/uivwimp.hxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index de6e43799d88..a5d8ccd24e61 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -203,8 +203,8 @@ BOOL SwDPage::RequestHelp( Window* pWindow, SdrView* pView, aPt -= pFly->Frm().Pos(); // ohne MapMode-Offset !!!!! // ohne MapMode-Offset, ohne Offset, o ... !!!!! - aPt = (Point&)(const Size&)pWindow->LogicToPixel( - (const Size&)aPt, MapMode( MAP_TWIP ) ); + aPt = pWindow->LogicToPixel( + aPt, MapMode( MAP_TWIP ) ); ((( sTxt += '?' ) += String::CreateFromInt32( aPt.X() )) += ',' ) += String::CreateFromInt32( aPt.Y() ); } diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 1bb8039130ba..b6cc1bf56fad 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -1651,8 +1651,8 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, String* pURL, Point aPt( rPt ); aPt -= pFly->Frm().Pos(); // ohne MapMode-Offset, ohne Offset, o ... !!!!! - aPt = (Point&)(const Size&)GetOut()->LogicToPixel( - (const Size&)aPt, MapMode( MAP_TWIP ) ); + aPt = GetOut()->LogicToPixel( + aPt, MapMode( MAP_TWIP ) ); ((( *pURL += '?' ) += String::CreateFromInt32( aPt.X() )) += ',' ) += String::CreateFromInt32(aPt.Y() ); } diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 493af14d8200..6775bf213736 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -750,7 +750,7 @@ SwDoc * ViewShell::CreatePrtDoc( SfxPrinter* pPrt, SfxObjectShellRef &rDocShellR // Wir bauen uns ein neues Dokument SwDoc *pPrtDoc = new SwDoc; pPrtDoc->acquire(); - pPrtDoc->SetRefForDocShell( (SfxObjectShellRef*)&(long&)rDocShellRef ); + pPrtDoc->SetRefForDocShell( boost::addressof(rDocShellRef) ); pPrtDoc->LockExpFlds(); // Der Drucker wird uebernommen @@ -838,7 +838,7 @@ SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt) // Wir bauen uns ein neues Dokument // SwDoc *pPrtDoc = new SwDoc; // pPrtDoc->acquire(); -// pPrtDoc->SetRefForDocShell( (SvEmbeddedObjectRef*)&(long&)rDocShellRef ); +// pPrtDoc->SetRefForDocShell( boost::addressof(rDocShellRef) ); pPrtDoc->LockExpFlds(); // Der Drucker wird uebernommen diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 613e0c4c46db..ea6ab45f4ec1 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -468,7 +468,7 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor ) pClpDocFac = new SwDocFac; SwDoc* pTmpDoc = pClpDocFac->GetDoc(); - pTmpDoc->SetRefForDocShell( (SfxObjectShellRef*)&(long&)aDocShellRef ); + pTmpDoc->SetRefForDocShell( boost::addressof(aDocShellRef) ); pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen pWrtShell->Copy( pTmpDoc ); @@ -883,7 +883,7 @@ int SwTransferable::PrepareForCopy( BOOL bIsCut ) SwDoc* pTmpDoc = pClpDocFac->GetDoc(); pTmpDoc->SetClipBoard( true ); - pTmpDoc->SetRefForDocShell( (SfxObjectShellRef*)&(long&)aDocShellRef ); + pTmpDoc->SetRefForDocShell( boost::addressof(aDocShellRef) ); pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen pWrtShell->Copy( pTmpDoc ); @@ -1067,7 +1067,7 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary, SwCntntNode* pCNd = rNds.GoNext( &aNodeIdx ); // gehe zum 1. ContentNode SwPaM aPam( *pCNd ); - pCDoc->SetRefForDocShell( (SfxObjectShellRef*)&(long&)aDocShellRef ); + pCDoc->SetRefForDocShell( boost::addressof(aDocShellRef) ); pCDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen pCDoc->InsertGlossary( rGlossary, rStr, aPam, 0 ); diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx index 65b8d0b9b95b..d23da67e4209 100644 --- a/sw/source/ui/inc/uivwimp.hxx +++ b/sw/source/ui/inc/uivwimp.hxx @@ -153,7 +153,7 @@ public: SfxObjectShellRef & GetTmpSelectionDoc() { return xTmpSelDocSh; } - SfxObjectShellRef& GetEmbeddedObjRef() { return (SfxObjectShellRef&)(long&)aEmbeddedObjRef; } + SfxObjectShellRef& GetEmbeddedObjRef() { return *boost::addressof(aEmbeddedObjRef); } void AddTransferable(SwTransferable& rTransferable); |