diff options
Diffstat (limited to 'sd/source/ui/table')
-rw-r--r-- | sd/source/ui/table/TableDesignPane.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/table/tablefunction.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 09ed83994e95..4a84a52be381 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -635,7 +635,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, if( xCellInfo.get() ) { // fill cell background - const Rectangle aRect( nX, nY, nX + nCellWidth - 1, nY + nCellHeight - 1 ); + const ::tools::Rectangle aRect( nX, nY, nX + nCellWidth - 1, nY + nCellHeight - 1 ); if( xCellInfo->maCellColor.GetColor() != COL_TRANSPARENT ) { diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 2ab095e09c29..69878f2ef874 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -137,7 +137,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) nRows = pDlg->getRows(); } - Rectangle aRect; + ::tools::Rectangle aRect; SdrObject* pPickObj = mpView->GetEmptyPresentationObject( PRESOBJ_TABLE ); if( pPickObj ) @@ -150,7 +150,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) Size aSize( 14100, 2000 ); Point aPos; - Rectangle aWinRect(aPos, GetActiveWindow()->GetOutputSizePixel()); + ::tools::Rectangle aWinRect(aPos, GetActiveWindow()->GetOutputSizePixel()); aWinRect = GetActiveWindow()->PixelToLogic(aWinRect); // make sure that the default size of the table fits on the paper and is inside the viewing area. @@ -160,7 +160,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) if (comphelper::LibreOfficeKit::isActive()) { // aWinRect is nonsensical in the LOK case - aWinRect = Rectangle(aPos, aMaxSize); + aWinRect = ::tools::Rectangle(aPos, aMaxSize); } else { @@ -184,7 +184,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) aPos = aWinRect.Center(); aPos.X() -= aSize.Width() / 2; aPos.Y() -= aSize.Height() / 2; - aRect = Rectangle(aPos, aSize); + aRect = ::tools::Rectangle(aPos, aSize); } sdr::table::SdrTableObj* pObj = new sdr::table::SdrTableObj( GetDoc(), aRect, nColumns, nRows ); @@ -275,7 +275,7 @@ void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel ) { Size aSize( 200, 200 ); Point aPos; - Rectangle aRect (aPos, aSize); + ::tools::Rectangle aRect (aPos, aSize); sdr::table::SdrTableObj* pObj = new sdr::table::SdrTableObj( pModel, aRect, 1, 1 ); pObj->NbcSetStyleSheet( pModel->GetDefaultStyleSheet(), true ); OUString sTableStyle; |