diff options
Diffstat (limited to 'extensions/source/propctrlr')
| -rw-r--r-- | extensions/source/propctrlr/browserline.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/browserlistbox.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/propctrlr/fontdialog.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/propctrlr/inspectorhelpwindow.cxx | 8 | ||||
| -rw-r--r-- | extensions/source/propctrlr/listselectiondlg.cxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index c223cc6dc305..d40f9f31cee4 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -209,7 +209,7 @@ namespace pcr if ( m_bIndentTitle ) { - Size aIndent( m_pTheParent->LogicToPixel( Size( 8, 0 ), MAP_APPFONT ) ); + Size aIndent( m_pTheParent->LogicToPixel( Size( 8, 0 ), MapUnit::MapAppFont ) ); aTitlePos.X() += aIndent.Width(); aTitleSize.Width() -= aIndent.Width(); } diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index bd9758a3fcf5..7036a7b22e8e 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -436,7 +436,7 @@ namespace pcr void OBrowserListBox::Resize() { Rectangle aPlayground( Point( 0, 0 ), GetOutputSizePixel() ); - Size aHelpWindowDistance( LogicToPixel( Size( 0, LAYOUT_HELP_WINDOW_DISTANCE_APPFONT ), MAP_APPFONT ) ); + Size aHelpWindowDistance( LogicToPixel( Size( 0, LAYOUT_HELP_WINDOW_DISTANCE_APPFONT ), MapUnit::MapAppFont ) ); long nHelpWindowHeight = m_nCurrentPreferredHelpHeight = impl_getPrefererredHelpHeight(); bool bPositionHelpWindow = ( nHelpWindowHeight != 0 ); @@ -773,7 +773,7 @@ namespace pcr if ( HasHelpSection() ) { - Size aHelpWindowDistance( LogicToPixel( Size( 0, LAYOUT_HELP_WINDOW_DISTANCE_APPFONT ), MAP_APPFONT ) ); + Size aHelpWindowDistance( LogicToPixel( Size( 0, LAYOUT_HELP_WINDOW_DISTANCE_APPFONT ), MapUnit::MapAppFont ) ); nMinHeight += aHelpWindowDistance.Height(); nMinHeight += m_pHelpWindow->GetMinimalHeightPixel(); diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 400739aa8e46..61a8a718e472 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -224,7 +224,7 @@ namespace pcr // build SfxItems with the values SvxFontItem aFontItem((FontFamily)nFontFamily, aFontName, aFontStyleName, PITCH_DONTKNOW, nFontCharset, CFID_FONT); - nFontHeight = (float)OutputDevice::LogicToLogic(Size(0, (sal_Int32)nFontHeight), MAP_POINT, MAP_TWIP).Height(); + nFontHeight = (float)OutputDevice::LogicToLogic(Size(0, (sal_Int32)nFontHeight), MapUnit::MapPoint, MapUnit::MapTwip).Height(); SvxFontHeightItem aSvxFontHeightItem((sal_uInt32)nFontHeight,100,CFID_HEIGHT); FontWeight eWeight=VCLUnoHelper::ConvertFontWeight(nFontWeight); @@ -328,7 +328,7 @@ namespace pcr const SvxFontHeightItem& rSvxFontHeightItem = static_cast<const SvxFontHeightItem&>(_rSet.Get(CFID_HEIGHT)); - float nHeight = (float)OutputDevice::LogicToLogic(Size(0, rSvxFontHeightItem.GetHeight()), MAP_TWIP, MAP_POINT).Height(); + float nHeight = (float)OutputDevice::LogicToLogic(Size(0, rSvxFontHeightItem.GetHeight()), MapUnit::MapTwip, MapUnit::MapPoint).Height(); lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_HEIGHT,makeAny(nHeight)); } diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index c0090fa582bd..ddf871e5e752 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -81,8 +81,8 @@ namespace pcr long InspectorHelpWindow::impl_getSpaceAboveTextWindow() { - Size aSeparatorSize( LogicToPixel( Size( 0, 8 ), MAP_APPFONT ) ); - Size a3AppFontSize( LogicToPixel( Size( 3, 3 ), MAP_APPFONT ) ); + Size aSeparatorSize( LogicToPixel( Size( 0, 8 ), MapUnit::MapAppFont ) ); + Size a3AppFontSize( LogicToPixel( Size( 3, 3 ), MapUnit::MapAppFont ) ); return aSeparatorSize.Height() + a3AppFontSize.Height(); } @@ -125,12 +125,12 @@ namespace pcr void InspectorHelpWindow::Resize() { - Size a3AppFont( LogicToPixel( Size( 3, 3 ), MAP_APPFONT ) ); + Size a3AppFont( LogicToPixel( Size( 3, 3 ), MapUnit::MapAppFont ) ); Rectangle aPlayground( Point( 0, 0 ), GetOutputSizePixel() ); Rectangle aSeparatorArea( aPlayground ); - aSeparatorArea.Bottom() = aSeparatorArea.Top() + LogicToPixel( Size( 0, 8 ), MAP_APPFONT ).Height(); + aSeparatorArea.Bottom() = aSeparatorArea.Top() + LogicToPixel( Size( 0, 8 ), MapUnit::MapAppFont ).Height(); m_aSeparator->SetPosSizePixel( aSeparatorArea.TopLeft(), aSeparatorArea.GetSize() ); Rectangle aTextArea( aPlayground ); diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 73afae7f3649..41fc4b57d982 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -39,7 +39,7 @@ namespace pcr OSL_PRECOND( m_xListBox.is(), "ListSelectionDialog::ListSelectionDialog: invalid list box!" ); get(m_pEntries, "treeview"); - Size aSize(LogicToPixel(Size(85, 97), MAP_APPFONT)); + Size aSize(LogicToPixel(Size(85, 97), MapUnit::MapAppFont)); m_pEntries->set_width_request(aSize.Width()); m_pEntries->set_height_request(aSize.Height()); |