diff options
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/DateTime.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportWindow.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ScrollHelper.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/report/SectionWindow.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 2 |
13 files changed, 24 insertions, 24 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 925141580f18..9f4998fb7807 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -280,7 +280,7 @@ OStyle::OStyle() :OStyle_PBASE(m_aBHelper) ,m_aSize(21000,29700) { - const ::Size aDefaultSize = SvxPaperInfo::GetDefaultPaperSize( MAP_100TH_MM ); + const ::Size aDefaultSize = SvxPaperInfo::GetDefaultPaperSize( MapUnit::Map100thMM ); m_aSize.Height = aDefaultSize.Height(); m_aSize.Width = aDefaultSize.Width(); @@ -591,7 +591,7 @@ void OReportDefinition::init() { m_pImpl->m_pReportModel.reset(new OReportModel(this)); m_pImpl->m_pReportModel->GetItemPool().FreezeIdRanges(); - m_pImpl->m_pReportModel->SetScaleUnit( MAP_100TH_MM ); + m_pImpl->m_pReportModel->SetScaleUnit( MapUnit::Map100thMM ); SdrLayerAdmin& rAdmin = m_pImpl->m_pReportModel->GetLayerAdmin(); rAdmin.NewStandardLayer(RPT_LAYER_FRONT); rAdmin.NewLayer("back", RPT_LAYER_BACK); diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index b0a67b116efe..9907c4f6342f 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -518,7 +518,7 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat { vcl::Font aBaseFont( Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetAppFont() ); SvxFont aFont( VCLUnoHelper::CreateFont( _xReportControlFormat->getFontDescriptor(), aBaseFont ) ); - aFont.SetFontHeight( OutputDevice::LogicToLogic( Size( 0, (sal_Int32)aFont.GetFontHeight() ), MAP_POINT, MAP_TWIP ).Height()); + aFont.SetFontHeight( OutputDevice::LogicToLogic( Size( 0, (sal_Int32)aFont.GetFontHeight() ), MapUnit::MapPoint, MapUnit::MapTwip ).Height()); aFont.SetEmphasisMark( static_cast< FontEmphasisMark >( _xReportControlFormat->getControlTextEmphasis() ) ); aFont.SetRelief( static_cast< FontRelief >( _xReportControlFormat->getCharRelief() ) ); aFont.SetColor( _xReportControlFormat->getCharColor() ); diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index b8d8a1fa7d0c..1ebefd570628 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -156,12 +156,12 @@ short ODateTimeDialog::Execute() if ( m_pDate->IsChecked() ) { OUString sDateFormat = m_pDateListBox->GetSelectEntry(); - nWidth = LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MAP_100TH_MM); + nWidth = LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MapUnit::Map100thMM); } if ( m_pTime->IsChecked() ) { OUString sDateFormat = m_pTimeListBox->GetSelectEntry(); - nWidth = ::std::max<sal_Int32>(LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MAP_100TH_MM),nWidth); + nWidth = ::std::max<sal_Int32>(LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MapUnit::Map100thMM),nWidth); } if ( nWidth > 4000 ) diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index c3a6b2b84c83..5475a1977987 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -923,7 +923,7 @@ void OFieldExpressionControl::InsertRows( long nRow ) Size OFieldExpressionControl::GetOptimalSize() const { - return LogicToPixel(Size(106, 75), MAP_APPFONT); + return LogicToPixel(Size(106, 75), MapUnit::MapAppFont); } // class OGroupsSortingDialog diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 2b1290c7b578..082c544de07a 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -865,7 +865,7 @@ void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource) Size NavigatorTree::GetOptimalSize() const { - return LogicToPixel(Size(100, 70), MAP_APPFONT); + return LogicToPixel(Size(100, 70), MapUnit::MapAppFont); } // class ONavigatorImpl diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 101b30173c7f..5ddd32dead06 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -239,7 +239,7 @@ namespace aFontItem.PutValue( uno::makeAny( aControlFont ), 0 ); _rItemSet.Put(aFontItem); - _rItemSet.Put(SvxFontHeightItem(OutputDevice::LogicToLogic(Size(0, (sal_Int32)aFont.GetFontHeight()), MAP_POINT, MAP_TWIP).Height(),100,_nFontHeight)); + _rItemSet.Put(SvxFontHeightItem(OutputDevice::LogicToLogic(Size(0, (sal_Int32)aFont.GetFontHeight()), MapUnit::MapPoint, MapUnit::MapTwip).Height(),100,_nFontHeight)); lang::Locale aLocale; switch(_nWhich) { @@ -390,7 +390,7 @@ namespace if ( SfxItemState::SET == _rItemSet.GetItemState( _nFontHeight,true,&pItem) && dynamic_cast< const SvxFontHeightItem *>( pItem ) != nullptr) { const SvxFontHeightItem* pFontItem = static_cast<const SvxFontHeightItem*>(pItem); - aNewFont.SetFontHeight(OutputDevice::LogicToLogic(Size(0, pFontItem->GetHeight()), MAP_TWIP, MAP_POINT).Height()); + aNewFont.SetFontHeight(OutputDevice::LogicToLogic(Size(0, pFontItem->GetHeight()), MapUnit::MapTwip, MapUnit::MapPoint).Height()); } if ( SfxItemState::SET == _rItemSet.GetItemState( _nPosture,true,&pItem) && dynamic_cast< const SvxPostureItem *>( pItem ) != nullptr) { @@ -703,7 +703,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep }; SfxItemPool* pPool( new SfxItemPool(OUString("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, pDefaults) ); - // not needed for font height pPool->SetDefaultMetric( MAP_100TH_MM ); // ripped, don't understand why + // not needed for font height pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same bool bSuccess = false; try diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index eb4383f9a612..6b21aec80a9f 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -103,7 +103,7 @@ ODesignView::ODesignView( vcl::Window* pParent, SetHelpId(UID_RPT_RPT_APP_VIEW); ImplInitSettings(); - SetMapMode( MapMode( MAP_100TH_MM ) ); + SetMapMode( MapMode( MapUnit::Map100thMM ) ); // now create the task pane on the right side :-) m_pTaskPane = VclPtr<OTaskWindow>::Create(this); @@ -161,7 +161,7 @@ void ODesignView::dispose() void ODesignView::initialize() { - SetMapMode( MapMode( MAP_100TH_MM ) ); + SetMapMode( MapMode( MapUnit::Map100thMM ) ); m_aScrollWindow->initialize(); m_aScrollWindow->Show(); } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 453dce3c726a..dbdadccecd50 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2420,7 +2420,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ pPool->SetDefaults(pDefaults); - pPool->SetDefaultMetric( MAP_100TH_MM ); // ripped, don't understand why + pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same try @@ -4217,7 +4217,7 @@ void OReportController::openZoomDialog() 0 }; SfxItemPool* pPool( new SfxItemPool(OUString("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) ); - pPool->SetDefaultMetric( MAP_100TH_MM ); // ripped, don't understand why + pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same try { diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 07c604f43971..ebc995e2b74a 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -90,7 +90,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re { //EnableChildTransparentMode(); SetHelpId(HID_REPORTSECTION); - SetMapMode(MapMode(MAP_100TH_MM)); + SetMapMode(MapMode(MapUnit::Map100thMM)); SetParentClipMode(ParentClipMode::Clip); EnableChildTransparentMode( false ); SetPaintTransparent( false ); diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index b1bcc1429459..949a83289c3b 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -64,7 +64,7 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) ,m_pObjFac( new DlgEdFactory() ) { SetHelpId(UID_RPT_REPORTWINDOW); - SetMapMode( MapMode( MAP_100TH_MM ) ); + SetMapMode( MapMode( MapUnit::Map100thMM ) ); m_aViewsWindow->Show(); @@ -174,7 +174,7 @@ void OReportWindow::Resize() const Size aTotalOutputSize = GetOutputSizePixel(); Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)*m_pView->getController().getZoomValue(),100); - const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, 0 ), MAP_APPFONT ); + const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, 0 ), MapUnit::MapAppFont ); Point aStartPoint((long)aStartWidth + aOffset.X(),0); uno::Reference<report::XReportDefinition> xReportDefinition = getReportView()->getController().getReportDefinition(); const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(xReportDefinition,PROPERTY_PAPERSIZE).Width; @@ -397,7 +397,7 @@ void OReportWindow::fillControlModelSelection(::std::vector< uno::Reference< uno sal_Int32 OReportWindow::impl_getRealPixelWidth() const { const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController().getReportDefinition(),PROPERTY_PAPERSIZE).Width; - MapMode aMap( MAP_100TH_MM ); + MapMode aMap( MapUnit::Map100thMM ); const Size aPageSize = LogicToPixel(Size(nPaperWidth,0),aMap); return aPageSize.Width() + REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH + SECTION_OFFSET; } @@ -416,7 +416,7 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const case SvxZoomType::WHOLEPAGE: { nZoom = (sal_uInt16)(long)Fraction(aSize.Width()*100,impl_getRealPixelWidth()); - MapMode aMap( MAP_100TH_MM ); + MapMode aMap( MapUnit::Map100thMM ); const Size aHeight = m_aViewsWindow->LogicToPixel(m_aViewsWindow->PixelToLogic(Size(0,GetTotalHeight() + m_aHRuler->GetSizePixel().Height())),aMap); nZoom = ::std::min(nZoom,(sal_uInt16)(long)Fraction(aSize.Height()*100,aHeight.Height())); } diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index e80990dc0d80..55cf12a58eb8 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -53,12 +53,12 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) ,m_aReportWindow(VclPtr<rptui::OReportWindow>::Create(this,m_pParent)) ,m_pReportDefinitionMultiPlexer(nullptr) { - SetMapMode( MapMode( MAP_100TH_MM ) ); + SetMapMode( MapMode( MapUnit::Map100thMM ) ); impl_initScrollBar( *m_aHScroll.get() ); impl_initScrollBar( *m_aVScroll.get() ); - m_aReportWindow->SetMapMode( MapMode( MAP_100TH_MM ) ); + m_aReportWindow->SetMapMode( MapMode( MapUnit::Map100thMM ) ); m_aReportWindow->Show(); // normally we should be SCROLL_PANE @@ -170,7 +170,7 @@ Size OScrollWindowHelper::ResizeScrollBars() else m_aCornerWin->Hide(); - const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, SECTION_OFFSET ), MAP_APPFONT ); + const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, SECTION_OFFSET ), MapUnit::MapAppFont ); // resize scrollbars and set their ranges { Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH*m_pParent->getController().getZoomValue()),100); diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index c94d04032432..9d9230c17835 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -57,7 +57,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep SetMapMode( rMapMode ); ImplInitSettings(); // TRY - m_aSplitter->SetMapMode( MapMode( MAP_100TH_MM ) ); + m_aSplitter->SetMapMode( MapMode( MapUnit::Map100thMM ) ); m_aSplitter->SetStartSplitHdl(LINK(this, OSectionWindow,StartSplitHdl)); m_aSplitter->SetSplitHdl(LINK(this, OSectionWindow,SplitHdl)); m_aSplitter->SetEndSplitHdl(LINK(this, OSectionWindow,EndSplitHdl)); diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 561676a843cd..6e2be36bc776 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -173,7 +173,7 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) , m_bInUnmark(false) { SetPaintTransparent(true); - SetMapMode(MapMode(MAP_100TH_MM)); + SetMapMode(MapMode(MapUnit::Map100thMM)); m_aColorConfig.AddListener(this); ImplInitSettings(); } |