summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-10-26 23:15:06 +0200
committerMichael Stahl <mstahl@redhat.com>2017-10-26 23:17:45 +0200
commit11d2f3d6e1b6c9baf43d8521293c53525108436d (patch)
treeffe35d5d47713a11c93c3bf11f588eeaf492fc16 /dbaccess
parent213f7c02d4f3ddbe2f52950575e2559c52d98ac2 (diff)
vcl: make MapMode constructor explicit
Insert constructor everywhere, except a couple places that apparently want to compare GetMapUnit(). Change-Id: I1910deb60562e5e949203435e827057f70a3f988
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.cxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx4
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx2
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.cxx4
-rw-r--r--dbaccess/source/ui/app/AppView.cxx4
-rw-r--r--dbaccess/source/ui/browser/brwview.cxx2
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx4
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx8
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx2
-rw-r--r--dbaccess/source/ui/control/VertSplitView.cxx2
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx2
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx2
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx4
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx12
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx10
-rw-r--r--dbaccess/source/ui/querydesign/querycontainerwindow.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx2
22 files changed, 39 insertions, 39 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 6dcd3c1f75b4..7fffb394e49b 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -140,7 +140,7 @@ namespace dbmm
declarePath( PATH_DEFAULT, {STATE_CLOSE_SUB_DOCS, STATE_BACKUP_DBDOC, STATE_MIGRATE, STATE_SUMMARY} );
- SetPageSizePixel( LogicToPixel( ::Size( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ), MapUnit::MapAppFont ) );
+ SetPageSizePixel(LogicToPixel(::Size(TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT), MapMode(MapUnit::MapAppFont)));
SetRoadmapInteractive( true );
enableAutomaticNextButtonState();
defaultButton( WizardButtonFlags::NEXT );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 0dc91616ec29..915321866cb8 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -926,7 +926,7 @@ void OAppDetailPageHelper::Resize()
vcl::Window* pWindow = getCurrentView();
if ( pWindow )
{
- Size aFLSize = LogicToPixel( Size( 2, 6 ), MapUnit::MapAppFont );
+ Size aFLSize = LogicToPixel(Size(2, 6), MapMode(MapUnit::MapAppFont));
sal_Int32 n6PPT = aFLSize.Height();
long nHalfOutputWidth = static_cast<long>(nOutputWidth * 0.5);
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index c702d17cb6f3..294d631cc37d 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -442,7 +442,7 @@ void OTasksWindow::Resize()
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
- Size aFLSize = LogicToPixel( Size( 2, 6 ), MapUnit::MapAppFont );
+ Size aFLSize = LogicToPixel(Size(2, 6), MapMode(MapUnit::MapAppFont));
sal_Int32 n6PPT = aFLSize.Height();
long nHalfOutputWidth = static_cast<long>(nOutputWidth * 0.5);
@@ -540,7 +540,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
m_aContainer->Show();
- const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MapUnit::MapAppFont ).Width();
+ const long nFrameWidth = LogicToPixel(Size(3, 0), MapMode(MapUnit::MapAppFont)).Width();
m_aHorzSplitter->SetPosSizePixel( Point(0,50), Size(0,nFrameWidth) );
// now set the components at the base class
set(m_aContainer.get(),m_aTasks.get());
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 81fc34116786..ae9391900db0 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -62,7 +62,7 @@ void OApplicationSwapWindow::dispose()
void OApplicationSwapWindow::Resize()
{
- Size aFLSize = LogicToPixel( Size( 8, 0 ), MapUnit::MapAppFont );
+ Size aFLSize = LogicToPixel(Size(8, 0), MapMode(MapUnit::MapAppFont));
long nX = 0;
if ( m_aIconControl->GetEntryCount() != 0 )
nX = m_aIconControl->GetBoundingBox( m_aIconControl->GetEntry(0) ).GetWidth() + aFLSize.Width();
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 04755cc32d54..9f18829c2c67 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -81,7 +81,7 @@ void OTitleWindow::Resize()
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
- Size aTextSize = LogicToPixel( Size( 6, 3 ), MapUnit::MapAppFont );
+ Size aTextSize = LogicToPixel(Size(6, 3), MapMode(MapUnit::MapAppFont));
sal_Int32 nXOffset = aTextSize.Width();
sal_Int32 nYOffset = aTextSize.Height();
sal_Int32 nHeight = GetTextHeight() + 2*nYOffset;
@@ -116,7 +116,7 @@ void OTitleWindow::GetFocus()
long OTitleWindow::GetWidthPixel() const
{
- Size aTextSize = LogicToPixel( Size( 12, 0 ), MapUnit::MapAppFont );
+ Size aTextSize = LogicToPixel(Size(12, 0), MapMode(MapUnit::MapAppFont));
sal_Int32 nWidth = GetTextWidth(m_aTitle->GetText()) + 2*aTextSize.Width();
return nWidth;
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 18f765520d2c..30889fe85f83 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -112,7 +112,7 @@ void OAppBorderWindow::Resize()
long nOutputHeight = aOutputSize.Height();
long nX = 0;
- Size aFLSize = LogicToPixel( Size( 3, 8 ), MapUnit::MapAppFont );
+ Size aFLSize = LogicToPixel(Size(3, 8), MapMode(MapUnit::MapAppFont));
if ( m_pPanel )
{
OApplicationSwapWindow* pSwap = getPanel();
@@ -237,7 +237,7 @@ void OApplicationView::resizeDocumentView(tools::Rectangle& _rPlayground)
{
if ( m_pWin && !_rPlayground.IsEmpty() )
{
- Size aFLSize = LogicToPixel( Size( 3, 3 ), MapUnit::MapAppFont );
+ Size aFLSize = LogicToPixel(Size(3, 3), MapMode(MapUnit::MapAppFont));
_rPlayground.Move( aFLSize.Width(),aFLSize.Height() );
Size aOldSize = _rPlayground.GetSize();
_rPlayground.SetSize( Size(aOldSize.Width() - 2*aFLSize.Width(), aOldSize.Height() - 2*aFLSize.Height()) );
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 8cdbf8e4d99e..4a98532f7c71 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -216,7 +216,7 @@ void UnoDataBrowserView::resizeDocumentView(tools::Rectangle& _rPlayground)
if (m_pStatus && m_pStatus->IsVisible())
{
Size aStatusSize(aPlaygroundPos.X(), GetTextHeight() + 2);
- aStatusSize = LogicToPixel(aStatusSize, MapUnit::MapAppFont);
+ aStatusSize = LogicToPixel(aStatusSize, MapMode(MapUnit::MapAppFont));
aStatusSize.Width() = aTreeViewSize.Width() - 2 - 2;
Point aStatusPos( aPlaygroundPos.X() + 2, aTreeViewPos.Y() + aTreeViewSize.Height() - aStatusSize.Height() );
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 8013a7561d5e..60b233d851de 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -343,7 +343,7 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
{
// create controls and set sizes
- const long nFrameWidth = getBrowserView()->LogicToPixel( ::Size( 3, 0 ), MapUnit::MapAppFont ).Width();
+ const long nFrameWidth = getBrowserView()->LogicToPixel(::Size(3, 0), MapMode(MapUnit::MapAppFont)).Width();
m_pSplitter = VclPtr<Splitter>::Create(getBrowserView(),WB_HSCROLL);
m_pSplitter->SetPosSizePixel( ::Point(0,0), ::Size(nFrameWidth,0) );
@@ -359,7 +359,7 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
m_pTreeView->SetHelpId(HID_CTL_TREEVIEW);
// a default pos for the splitter, so that the listbox is about 80 (logical) pixels wide
- m_pSplitter->SetSplitPosPixel( getBrowserView()->LogicToPixel( ::Size( 80, 0 ), MapUnit::MapAppFont ).Width() );
+ m_pSplitter->SetSplitPosPixel(getBrowserView()->LogicToPixel(::Size(80, 0), MapMode(MapUnit::MapAppFont)).Width());
getBrowserView()->setSplitter(m_pSplitter);
getBrowserView()->setTreeView(m_pTreeView);
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 1a312ec1da34..15db79ca2fa2 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -290,7 +290,7 @@ void OFieldDescControl::CheckScrollBars()
// Which one is the last one that fits?
sal_uInt16 nLastVisible;
const sal_Int32 nControlHeight = GetMaxControlHeight();
- const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MapUnit::MapAppFont).Height();
+ const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y), MapMode(MapUnit::MapAppFont)).Height();
if (bNeedHScrollBar)
nLastVisible = static_cast<sal_uInt16>((szOverallSize.Height() - nControl_Spacing_y - nHScrollHeight) / (nControl_Spacing_y + nControlHeight));
else
@@ -369,7 +369,7 @@ void OFieldDescControl::ScrollAllAggregates()
if (m_nOldVThumb != m_pVertScroll->GetThumbPos())
{
const sal_Int32 nControlHeight = GetMaxControlHeight();
- const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MapUnit::MapAppFont).Height();
+ const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y), MapMode(MapUnit::MapAppFont)).Height();
nDeltaY = (m_nOldVThumb - m_pVertScroll->GetThumbPos()) * (nControl_Spacing_y + nControlHeight);
m_nOldVThumb = m_pVertScroll->GetThumbPos();
}
@@ -996,7 +996,7 @@ void OFieldDescControl::SetPosSize( VclPtr<Control> const & rControl, long nRow,
const sal_Int32 nControlHeight = GetMaxControlHeight();
Size aSize(0,nControlHeight);
if ( isRightAligned() && nCol )
- aSize.Width() = LogicToPixel(Size(m_nWidth, 0),MapUnit::MapAppFont).Width();
+ aSize.Width() = LogicToPixel(Size(m_nWidth, 0), MapMode(MapUnit::MapAppFont)).Width();
else
{
switch( nCol )
@@ -1043,7 +1043,7 @@ void OFieldDescControl::SetPosSize( VclPtr<Control> const & rControl, long nRow,
rControl->SetSizePixel( aSize );
aSize = rControl->GetSizePixel( );
- const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MapUnit::MapAppFont).Height();
+ const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y), MapMode(MapUnit::MapAppFont)).Height();
aPosition.Y() += ((nRow+1)*nControl_Spacing_y) +
(nRow*nControlHeight);
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 45e199234dc8..1129015ac905 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -434,7 +434,7 @@ namespace dbaui
Size ORelationControl::GetOptimalSize() const
{
- return LogicToPixel(Size(140, 80), MapUnit::MapAppFont);
+ return LogicToPixel(Size(140, 80), MapMode(MapUnit::MapAppFont));
}
// class OTableListBoxControl
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 7938f1be137b..b12b1c9be94f 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -155,7 +155,7 @@ void OSplitterView::setSplitter(Splitter* _pSplitter)
m_pSplitter = _pSplitter;
if ( m_pSplitter )
{
- m_pSplitter->SetSplitPosPixel( LogicToPixel( Size( SPLITTER_WIDTH, 0 ), MapUnit::MapAppFont ).Width() );
+ m_pSplitter->SetSplitPosPixel(LogicToPixel(Size(SPLITTER_WIDTH, 0), MapMode(MapUnit::MapAppFont)).Width());
m_pSplitter->SetSplitHdl( LINK(this, OSplitterView, SplitHdl) );
m_pSplitter->Show();
LINK( this, OSplitterView, SplitHdl ).Call(m_pSplitter);
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 944590902af1..92d62b0fcf1c 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -279,7 +279,7 @@ namespace dbaui
aReference.Y() += _rReference.GetSizePixel().Height();
const vcl::Window* pConverter = _rControl.GetParent();
- Size aOffset = pConverter->LogicToPixel( Size( _nIndentAppFont, ( _eRelation == RelatedControls ? 3 : 6 ) ), MapUnit::MapAppFont );
+ Size aOffset = pConverter->LogicToPixel(Size(_nIndentAppFont, (_eRelation == RelatedControls ? 3 : 6)), MapMode(MapUnit::MapAppFont));
Point aControlPos( aReference.X() + aOffset.Width(), aReference.Y() + aOffset.Height() );
_rControl.SetPosPixel( aControlPos );
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index e7c0bde45c9e..b31304907f10 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -324,7 +324,7 @@ OAddTableDlg::OAddTableDlg( vcl::Window* pParent, IAddTableDialogContext& _rCont
get(m_pTableList, "tablelist");
get(m_pQueryList, "querylist");
- Size aSize(LogicToPixel(Size(106 , 122), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(106 , 122), MapMode(MapUnit::MapAppFont)));
m_pTableList->set_height_request(aSize.Height());
m_pTableList->set_width_request(aSize.Width());
get(m_pQueryList, "querylist");
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index aeba83f7451a..91e80069e6d2 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -50,7 +50,7 @@ ODbaseIndexDialog::ODbaseIndexDialog(vcl::Window * pParent, const OUString& aDat
get(m_pIndexes, "frame");
get(m_pLB_TableIndexes, "tableindex");
get(m_pLB_FreeIndexes, "freeindex");
- Size aSize(LogicToPixel(Size(76, 98), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(76, 98), MapMode(MapUnit::MapAppFont)));
m_pLB_TableIndexes->set_height_request(aSize.Height());
m_pLB_TableIndexes->set_width_request(aSize.Width());
m_pLB_FreeIndexes->set_height_request(aSize.Height());
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 21c58e43b954..5f442463b0b2 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -80,7 +80,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
m_eType = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*m_pOutSet);
- SetPageSizePixel(LogicToPixel(::Size(PAGE_X, PAGE_Y), MapUnit::MapAppFont));
+ SetPageSizePixel(LogicToPixel(::Size(PAGE_X, PAGE_Y), MapMode(MapUnit::MapAppFont)));
defaultButton(WizardButtonFlags::NEXT);
enableButtons(WizardButtonFlags::FINISH, false);
enableAutomaticNextButtonState();
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index e79fde0c1466..44fff07cca7f 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -147,7 +147,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
- SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MapUnit::MapAppFont));
+ SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MapMode(MapUnit::MapAppFont)));
defaultButton(WizardButtonFlags::NEXT);
enableButtons(WizardButtonFlags::FINISH, true);
enableAutomaticNextButtonState();
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index b833d8b6ba32..571ea3f7ef54 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -190,7 +190,7 @@ namespace dbaui
maLcResetCmdImg = get<FixedImage>("image5")->GetImage();
get(m_pIndexList, "INDEX_LIST");
- Size aSize(LogicToPixel(Size(70, 97), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(70, 97), MapMode(MapUnit::MapAppFont)));
m_pIndexList->set_width_request(aSize.Width());
m_pIndexList->set_height_request(aSize.Height());
get(m_pIndexDetails, "INDEX_DETAILS");
@@ -199,7 +199,7 @@ namespace dbaui
get(m_pUnique, "UNIQUE");
get(m_pFieldsLabel, "FIELDS_LABEL");
get(m_pFields, "FIELDS");
- aSize = LogicToPixel(Size(128, 61), MapUnit::MapAppFont);
+ aSize = LogicToPixel(Size(128, 61), MapMode(MapUnit::MapAppFont));
m_pFields->set_width_request(aSize.Width());
m_pFields->set_height_request(aSize.Height());
get(m_pClose, "close");
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 33adebe519d0..c33ae52b22d4 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -305,11 +305,11 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti
, m_aExceptions(_rExceptions)
{
get(m_pExceptionList, "list");
- Size aListSize(LogicToPixel(Size(85, 93), MapUnit::MapAppFont));
+ Size aListSize(LogicToPixel(Size(85, 93), MapMode(MapUnit::MapAppFont)));
m_pExceptionList->set_width_request(aListSize.Width());
m_pExceptionList->set_height_request(aListSize.Height());
get(m_pExceptionText, "description");
- Size aTextSize(LogicToPixel(Size(125 , 93), MapUnit::MapAppFont));
+ Size aTextSize(LogicToPixel(Size(125, 93), MapMode(MapUnit::MapAppFont)));
m_pExceptionText->set_width_request(aTextSize.Width());
m_pExceptionText->set_height_request(aTextSize.Height());
@@ -400,8 +400,8 @@ namespace
{
void lcl_positionInAppFont( const vcl::Window& _rParent, vcl::Window& _rChild, long _nX, long _nY, long Width, long Height )
{
- Point aPos = _rParent.LogicToPixel( Point( _nX, _nY ), MapUnit::MapAppFont );
- Size aSize = _rParent.LogicToPixel( Size( Width, Height ), MapUnit::MapAppFont );
+ Point aPos = _rParent.LogicToPixel(Point(_nX, _nY), MapMode(MapUnit::MapAppFont));
+ Size aSize = _rParent.LogicToPixel(Size(Width, Height), MapMode(MapUnit::MapAppFont));
_rChild.SetPosSizePixel( aPos, aSize );
}
@@ -514,8 +514,8 @@ void OSQLMessageBox::impl_positionControls()
// adjust dialog size accordingly
const tools::Rectangle& rBottomTextRect( bHaveSecondaryText ? aSecondaryRect : aPrimaryRect );
- Size aBorderSize = LogicToPixel( Size( OUTER_MARGIN, OUTER_MARGIN ), MapUnit::MapAppFont );
- Size aDialogSize( LogicToPixel( Size( DIALOG_WIDTH, 30 ), MapUnit::MapAppFont ) );
+ Size aBorderSize = LogicToPixel(Size(OUTER_MARGIN, OUTER_MARGIN), MapMode(MapUnit::MapAppFont));
+ Size aDialogSize( LogicToPixel(Size(DIALOG_WIDTH, 30), MapMode(MapUnit::MapAppFont)));
aDialogSize.Height() = rBottomTextRect.Bottom() + aBorderSize.Height();
aDialogSize.Width() = aPrimaryRect.Right() + aBorderSize.Width();
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index d02fe9a4db7a..355c19bbd40d 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -646,11 +646,11 @@ void OCopyTableWizard::construct()
AddButton( m_pbNext = VclPtr<PushButton>::Create(this, WB_TABSTOP));
AddButton( m_pbFinish = VclPtr<PushButton>::Create(this, WB_TABSTOP));
- m_pbHelp->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pbCancel->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pbPrev->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pbNext->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pbFinish->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
+ m_pbHelp->SetSizePixel( LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)) );
+ m_pbCancel->SetSizePixel( LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)) );
+ m_pbPrev->SetSizePixel( LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)) );
+ m_pbNext->SetSizePixel( LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)) );
+ m_pbFinish->SetSizePixel( LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)) );
m_pbPrev->SetText(DBA_RES(STR_WIZ_PB_PREV));
m_pbNext->SetText(DBA_RES(STR_WIZ_PB_NEXT));
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index c558da3bd186..b22ceb332ad9 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -202,7 +202,7 @@ namespace dbaui
Size aSize = GetOutputSizePixel();
Size aBeamer(aSize.Width(),sal_Int32(aSize.Height()*0.33));
- const long nFrameHeight = LogicToPixel( Size( 0, 3 ), MapUnit::MapAppFont ).Height();
+ const long nFrameHeight = LogicToPixel(Size(0, 3), MapMode(MapUnit::MapAppFont)).Height();
Point aPos(0,aBeamer.Height()+nFrameHeight);
m_pBeamer->SetPosSizePixel(Point(0,0),aBeamer);
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 6a6ae3ead9b0..fc72b132033b 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -55,7 +55,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
, m_xConnection(_xConnection)
{
get(m_pML_HelpText, "helptext");
- Size aSize(LogicToPixel(Size(179, 49), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(179, 49), MapMode(MapUnit::MapAppFont)));
//alternatively loop through the STR_QUERY_* strings with their STR_JOIN_TYPE_HINT
//suffix to find the longest entry at runtime
m_pML_HelpText->set_height_request(aSize.Height());
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 4cebe4d78a64..bcd2ff733812 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -45,7 +45,7 @@ OTableRowView::OTableRowView(vcl::Window* pParent)
, m_nCurUndoActId(0)
{
SetHelpId(HID_TABDESIGN_BACKGROUND);
- SetSizePixel(LogicToPixel(Size(40, 12), MapUnit::MapAppFont));
+ SetSizePixel(LogicToPixel(Size(40, 12), MapMode(MapUnit::MapAppFont)));
}
void OTableRowView::Init()