From 954f752cf10fc6a8777af2a6a93e496688464687 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 20 Sep 2016 16:41:39 +0200 Subject: convert MapUnit to scoped enum I left a prefix on the names "Map" so that I would not have to re-arrange each name too much, since I can't start identifiers with digits like "100thMM" And remove RSC_EXTRAMAPUNIT, which doesn't seem to be doing anything anymore. Change-Id: I5187824aa87e30caf5357b51b5384b5ab919d224 Reviewed-on: https://gerrit.libreoffice.org/29096 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- .../accessibility/accessibledialogcontrolshape.cxx | 2 +- .../accessibility/accessibledialogwindow.cxx | 2 +- basctl/source/basicide/basicrenderable.cxx | 2 +- basctl/source/basicide/baside2.cxx | 2 +- basctl/source/basicide/baside2b.cxx | 4 +-- basctl/source/basicide/moduldl2.cxx | 4 +-- basctl/source/basicide/moduldlg.cxx | 2 +- basctl/source/basicide/objdlg.cxx | 6 ++-- basctl/source/dlged/dlged.cxx | 10 +++--- basctl/source/dlged/dlgedobj.cxx | 36 +++++++++++----------- 10 files changed, 35 insertions(+), 35 deletions(-) (limited to 'basctl') diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index b4f8ac0971ca..05e16b6e3d17 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -146,7 +146,7 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds() aRect.Move( aOrg.X(), aOrg.Y() ); // convert logic units to pixel - aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MAP_100TH_MM) ); + aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MapUnit::Map100thMM) ); // clip the shape's bounding box with the bounding box of its parent Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() ); diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 830d885373b7..653625857043 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -222,7 +222,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) aRect.Move( aOrg.X(), aOrg.Y() ); // convert logic units to pixel - aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MAP_100TH_MM) ); + aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MapUnit::Map100thMM) ); // check, if the shape's bounding box intersects with the bounding box of its parent Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() ); diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index d30171c78a6e..4e5a9675b2c3 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -128,7 +128,7 @@ Sequence SAL_CALL Renderable::getRenderer ( // no renderdevice is legal; the first call is to get our print ui options if( pPrinter ) { - Size aPageSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) ); + Size aPageSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) ) ); awt::Size aSize; aSize.Width = aPageSize.Width(); diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index c994910dbd9c..11872eb4e3f6 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -804,7 +804,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage ) aFont.SetTransparent( true ); aFont.SetFontSize( Size( 0, 360 ) ); pPrinter->SetFont( aFont ); - pPrinter->SetMapMode( MAP_100TH_MM ); + pPrinter->SetMapMode( MapUnit::Map100thMM ); OUString aTitle( CreateQualifiedName() ); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 9b8eb6fc53e6..57f04b0f1492 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1617,7 +1617,7 @@ WatchWindow::WatchWindow (Layout* pParent) : tabs[ 1 ] = 0; tabs[ 2 ] = nVarTabWidth; tabs[ 3 ] = nVarTabWidth + nValueTabWidth; - aTreeListBox->SvHeaderTabListBox::SetTabs( tabs, MAP_PIXEL ); + aTreeListBox->SvHeaderTabListBox::SetTabs( tabs, MapUnit::MapPixel ); aTreeListBox->InitHeaderBar( aHeaderBar.get() ); aTreeListBox->SetNodeDefaultImages( ); @@ -1802,7 +1802,7 @@ IMPL_LINK_NOARG( WatchWindow, implEndDragHdl, HeaderBar *, void ) for( sal_uInt16 i = 1 ; i < nTabs ; ++i ) { nPos += aHeaderBar->GetItemSize( i ); - aTreeListBox->SetTab( i, nPos, MAP_PIXEL ); + aTreeListBox->SetTab( i, nPos, MapUnit::MapPixel ); } } diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index b4933cdb1c56..1b661a8c9d7d 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -483,7 +483,7 @@ LibPage::LibPage(vcl::Window * pParent) { get(m_pBasicsBox, "location"); get(m_pLibBox, "library"); - Size aSize(m_pLibBox->LogicToPixel(Size(130, 87), MAP_APPFONT)); + Size aSize(m_pLibBox->LogicToPixel(Size(130, 87), MapUnit::MapAppFont)); m_pLibBox->set_height_request(aSize.Height()); m_pLibBox->set_width_request(aSize.Width()); get(m_pEditButton, "edit"); @@ -510,7 +510,7 @@ LibPage::LibPage(vcl::Window * pParent) m_pLibBox->SetStyle( WB_HSCROLL | WB_BORDER | WB_TABSTOP ); long aTabs[] = { 2, 30, 120 }; - m_pLibBox->SetTabs( aTabs, MAP_PIXEL ); + m_pLibBox->SetTabs( aTabs, MapUnit::MapPixel ); FillListBox(); m_pBasicsBox->SelectEntryPos( 0 ); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 5a7ce994f70c..386069ed73e0 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -553,7 +553,7 @@ ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, sal_uInt16 nM ".ui") { get(m_pBasicBox, "library"); - Size aSize(m_pBasicBox->LogicToPixel(Size(130, 117), MAP_APPFONT)); + Size aSize(m_pBasicBox->LogicToPixel(Size(130, 117), MapUnit::MapAppFont)); m_pBasicBox->set_height_request(aSize.Height()); m_pBasicBox->set_width_request(aSize.Width()); get(m_pEditButton, "edit"); diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx index 2371c3facad3..240b7e15212f 100644 --- a/basctl/source/basicide/objdlg.cxx +++ b/basctl/source/basicide/objdlg.cxx @@ -112,15 +112,15 @@ void ObjectCatalog::ArrangeWindows() aTitle->Hide(); else { - Size aTitleSize = LogicToPixel(Size(3, 10), MAP_APPFONT); + Size aTitleSize = LogicToPixel(Size(3, 10), MapUnit::MapAppFont); aTitleSize.Width() = aSize.Width() - 2*aTitleSize.Width(); - aTitle->SetPosPixel(LogicToPixel(Point(3, 3), MAP_APPFONT)); + aTitle->SetPosPixel(LogicToPixel(Point(3, 3), MapUnit::MapAppFont)); aTitle->SetSizePixel(aTitleSize); aTitle->Show(); } // tree - Point const aTreePos = LogicToPixel(Point(3, bFloating ? 3 : 16), MAP_APPFONT); + Point const aTreePos = LogicToPixel(Point(3, bFloating ? 3 : 16), MapUnit::MapAppFont); long const nMargin = aTreePos.X(); Size const aTreeSize( aSize.Width() - 2*nMargin, diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 363f043465b9..09fb33607a25 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -200,7 +200,7 @@ DlgEditor::DlgEditor ( { pDlgEdModel->GetItemPool().FreezeIdRanges(); pDlgEdView.reset(new DlgEdView(*pDlgEdModel, rWindow_, *this)); - pDlgEdModel->SetScaleUnit( MAP_100TH_MM ); + pDlgEdModel->SetScaleUnit( MapUnit::Map100thMM ); SdrLayerAdmin& rAdmin = pDlgEdModel->GetLayerAdmin(); rAdmin.NewLayer( rAdmin.GetControlLayerName() ); @@ -221,7 +221,7 @@ DlgEditor::DlgEditor ( aMarkIdle.SetPriority(SchedulerPriority::LOW); aMarkIdle.SetIdleHdl( LINK( this, DlgEditor, MarkTimeout ) ); - rWindow.SetMapMode( MapMode( MAP_100TH_MM ) ); + rWindow.SetMapMode( MapMode( MapUnit::Map100thMM ) ); pDlgEdPage->SetSize( rWindow.PixelToLogic( Size(DLGED_PAGE_WIDTH_MIN, DLGED_PAGE_HEIGHT_MIN) ) ); pDlgEdView->ShowSdrPage(pDlgEdView->GetModel()->GetPage(0)); @@ -1150,7 +1150,7 @@ void DlgEditor::Print( Printer* pPrinter, const OUString& rTitle ) // not wor MapMode aOldMap( pPrinter->GetMapMode()); vcl::Font aOldFont( pPrinter->GetFont() ); - MapMode aMap( MAP_100TH_MM ); + MapMode aMap( MapUnit::Map100thMM ); pPrinter->SetMapMode( aMap ); vcl::Font aFont; aFont.SetAlignment( ALIGN_BOTTOM ); @@ -1215,13 +1215,13 @@ bool DlgEditor::AdjustPageSize() if ( pDlgEdForm && pDlgEdForm->TransformFormToSdrCoordinates( nFormXIn, nFormYIn, nFormWidthIn, nFormHeightIn, nFormX, nFormY, nFormWidth, nFormHeight ) ) { Size aPageSizeDelta( 400, 300 ); - aPageSizeDelta = rWindow.PixelToLogic( aPageSizeDelta, MapMode( MAP_100TH_MM ) ); + aPageSizeDelta = rWindow.PixelToLogic( aPageSizeDelta, MapMode( MapUnit::Map100thMM ) ); sal_Int32 nNewPageWidth = nFormX + nFormWidth + aPageSizeDelta.Width(); sal_Int32 nNewPageHeight = nFormY + nFormHeight + aPageSizeDelta.Height(); Size aPageSizeMin( DLGED_PAGE_WIDTH_MIN, DLGED_PAGE_HEIGHT_MIN ); - aPageSizeMin = rWindow.PixelToLogic( aPageSizeMin, MapMode( MAP_100TH_MM ) ); + aPageSizeMin = rWindow.PixelToLogic( aPageSizeMin, MapMode( MapUnit::Map100thMM ) ); sal_Int32 nPageWidthMin = aPageSizeMin.Width(); sal_Int32 nPageHeightMin = aPageSizeMin.Height(); diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 0f8edbe22d6f..e57f329e88d4 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -137,9 +137,9 @@ bool DlgEdObj::TransformSdrToControlCoordinates( DBG_ASSERT( pDevice, "DlgEdObj::TransformSdrToControlCoordinates: missing default device!" ); if ( !pDevice ) return false; - aPos = pDevice->LogicToPixel( aPos, MapMode( MAP_100TH_MM ) ); - aSize = pDevice->LogicToPixel( aSize, MapMode( MAP_100TH_MM ) ); - aFormPos = pDevice->LogicToPixel( aFormPos, MapMode( MAP_100TH_MM ) ); + aPos = pDevice->LogicToPixel( aPos, MapMode( MapUnit::Map100thMM ) ); + aSize = pDevice->LogicToPixel( aSize, MapMode( MapUnit::Map100thMM ) ); + aFormPos = pDevice->LogicToPixel( aFormPos, MapMode( MapUnit::Map100thMM ) ); // subtract form position aPos.Width() -= aFormPos.Width(); @@ -160,8 +160,8 @@ bool DlgEdObj::TransformSdrToControlCoordinates( } // convert pixel to logic units - aPos = pDevice->PixelToLogic( aPos, MAP_APPFONT ); - aSize = pDevice->PixelToLogic( aSize, MAP_APPFONT ); + aPos = pDevice->PixelToLogic( aPos, MapUnit::MapAppFont ); + aSize = pDevice->PixelToLogic( aSize, MapUnit::MapAppFont ); // set out parameters nXOut = aPos.Width(); @@ -185,8 +185,8 @@ bool DlgEdObj::TransformSdrToFormCoordinates( DBG_ASSERT( pDevice, "DlgEdObj::TransformSdrToFormCoordinates: missing default device!" ); if ( !pDevice ) return false; - aPos = pDevice->LogicToPixel( aPos, MapMode( MAP_100TH_MM ) ); - aSize = pDevice->LogicToPixel( aSize, MapMode( MAP_100TH_MM ) ); + aPos = pDevice->LogicToPixel( aPos, MapMode( MapUnit::Map100thMM ) ); + aSize = pDevice->LogicToPixel( aSize, MapMode( MapUnit::Map100thMM ) ); // take window borders into account DlgEdForm* pForm = nullptr; @@ -207,8 +207,8 @@ bool DlgEdObj::TransformSdrToFormCoordinates( aSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset; } // convert pixel to logic units - aPos = pDevice->PixelToLogic( aPos, MAP_APPFONT ); - aSize = pDevice->PixelToLogic( aSize, MAP_APPFONT ); + aPos = pDevice->PixelToLogic( aPos, MapUnit::MapAppFont ); + aSize = pDevice->PixelToLogic( aSize, MapUnit::MapAppFont ); // set out parameters nXOut = aPos.Width(); @@ -248,9 +248,9 @@ bool DlgEdObj::TransformControlToSdrCoordinates( DBG_ASSERT( pDevice, "DlgEdObj::TransformControlToSdrCoordinates: missing default device!" ); if ( !pDevice ) return false; - aPos = pDevice->LogicToPixel( aPos, MAP_APPFONT ); - aSize = pDevice->LogicToPixel( aSize, MAP_APPFONT ); - aFormPos = pDevice->LogicToPixel( aFormPos, MAP_APPFONT ); + aPos = pDevice->LogicToPixel( aPos, MapUnit::MapAppFont ); + aSize = pDevice->LogicToPixel( aSize, MapUnit::MapAppFont ); + aFormPos = pDevice->LogicToPixel( aFormPos, MapUnit::MapAppFont ); // add form position aPos.Width() += aFormPos.Width(); @@ -267,8 +267,8 @@ bool DlgEdObj::TransformControlToSdrCoordinates( } // convert pixel to 100th_mm - aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_100TH_MM ) ); - aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_100TH_MM ) ); + aPos = pDevice->PixelToLogic( aPos, MapMode( MapUnit::Map100thMM ) ); + aSize = pDevice->PixelToLogic( aSize, MapMode( MapUnit::Map100thMM ) ); // set out parameters nXOut = aPos.Width(); @@ -298,8 +298,8 @@ bool DlgEdObj::TransformFormToSdrCoordinates( if ( !lcl_getDlgEdForm( this, pForm ) ) return false; - aPos = pDevice->LogicToPixel( aPos, MAP_APPFONT ); - aSize = pDevice->LogicToPixel( aSize, MAP_APPFONT ); + aPos = pDevice->LogicToPixel( aPos, MapUnit::MapAppFont ); + aSize = pDevice->LogicToPixel( aSize, MapUnit::MapAppFont ); // take window borders into account Reference< beans::XPropertySet > xPSetForm( pForm->GetUnoControlModel(), UNO_QUERY ); @@ -316,8 +316,8 @@ bool DlgEdObj::TransformFormToSdrCoordinates( } // convert pixel to 100th_mm - aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_100TH_MM ) ); - aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_100TH_MM ) ); + aPos = pDevice->PixelToLogic( aPos, MapMode( MapUnit::Map100thMM ) ); + aSize = pDevice->PixelToLogic( aSize, MapMode( MapUnit::Map100thMM ) ); // set out parameters nXOut = aPos.Width(); -- cgit