summaryrefslogtreecommitdiff
path: root/cui/source/options
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/options')
-rw-r--r--cui/source/options/certpath.cxx2
-rw-r--r--cui/source/options/connpooloptions.cxx8
-rw-r--r--cui/source/options/dbregister.cxx8
-rw-r--r--cui/source/options/fontsubs.cxx6
-rw-r--r--cui/source/options/optaboutconfig.cxx6
-rw-r--r--cui/source/options/optfltr.cxx2
-rw-r--r--cui/source/options/optjava.cxx6
-rw-r--r--cui/source/options/optlingu.cxx2
-rw-r--r--cui/source/options/optpath.cxx8
-rw-r--r--cui/source/options/treeopt.cxx2
-rw-r--r--cui/source/options/webconninfo.cxx2
11 files changed, 26 insertions, 26 deletions
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 18ad0b14abac..f853ce3e9b50 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -31,7 +31,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent)
get(m_pOKBtn, "ok");
get(m_pAddBtn, "add");
get(m_pCertPathListContainer, "paths");
- Size aSize(LogicToPixel(Size(210, 60), MAP_APPFONT));
+ Size aSize(LogicToPixel(Size(210, 60), MapUnit::MapAppFont));
m_pCertPathListContainer->set_width_request(aSize.Width());
m_pCertPathListContainer->set_height_request(aSize.Height());
m_pCertPathList =
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 9362469caf3a..bf34078cac9a 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -127,11 +127,11 @@ namespace offapp
{
EditBrowseBox::Init();
- Size aColWidth = LogicToPixel(Size(160, 0), MAP_APPFONT);
+ Size aColWidth = LogicToPixel(Size(160, 0), MapUnit::MapAppFont);
InsertDataColumn(1, OUString(CUI_RES(RID_SVXSTR_DRIVER_NAME)), aColWidth.Width());
- aColWidth = LogicToPixel(Size(30, 0), MAP_APPFONT);
+ aColWidth = LogicToPixel(Size(30, 0), MapUnit::MapAppFont);
InsertDataColumn(2, OUString(CUI_RES(RID_SVXSTR_POOLED_FLAG)), aColWidth.Width());
- aColWidth = LogicToPixel(Size(60, 0), MAP_APPFONT);
+ aColWidth = LogicToPixel(Size(60, 0), MapUnit::MapAppFont);
InsertDataColumn(3, OUString(CUI_RES(RID_SVXSTR_POOL_TIMEOUT)), aColWidth.Width());
// Attention: the resource of the string is local to the resource of the enclosing dialog!
}
@@ -303,7 +303,7 @@ namespace offapp
get(m_pTimeout, "timeout");
Size aControlSize(248, 100);
- aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+ aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
m_pDriverList->set_width_request(aControlSize.Width());
m_pDriverList->set_height_request(aControlSize.Height());
m_pDriverList->Init();
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index be470fc95c0b..c34f7b60919b 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -110,7 +110,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
{
get(m_pPathCtrl, "pathctrl");
Size aControlSize(248, 147);
- aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+ aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
m_pPathCtrl->set_width_request(aControlSize.Width());
m_pPathCtrl->set_height_request(aControlSize.Height());
@@ -134,11 +134,11 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
Size aSz;
aSz.Width() = TAB_WIDTH1;
rBar.InsertItem( ITEMID_TYPE, m_aTypeText,
- LogicToPixel( aSz, MapMode( MAP_APPFONT ) ).Width(),
+ LogicToPixel( aSz, MapMode( MapUnit::MapAppFont ) ).Width(),
HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW );
aSz.Width() = TAB_WIDTH2;
rBar.InsertItem( ITEMID_PATH, m_aPathText,
- LogicToPixel( aSz, MapMode( MAP_APPFONT ) ).Width(),
+ LogicToPixel( aSz, MapMode( MapUnit::MapAppFont ) ).Width(),
HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER );
static long aTabs[] = {3, 0, TAB_WIDTH1, TAB_WIDTH1 + TAB_WIDTH2 };
@@ -364,7 +364,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void
long _nWidth = pBar->GetItemSize(i);
aSz.Width() = _nWidth + nTmpSz;
nTmpSz += _nWidth;
- m_pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width() );
+ m_pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MapUnit::MapAppFont) ).Width() );
}
}
}
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 9abe7d4db52b..7264c0d194c9 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -59,7 +59,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
SvSimpleTableContainer *pCheckLBContainer = get<SvSimpleTableContainer>("checklb");
Size aControlSize(248, 75);
- aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+ aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
pCheckLBContainer->set_width_request(aControlSize.Width());
pCheckLBContainer->set_height_request(aControlSize.Height());
@@ -421,7 +421,7 @@ void SvxFontSubstCheckListBox::setColSizes()
long nW1 = rBar.GetTextWidth(rBar.GetItemText(3));
long nW2 = rBar.GetTextWidth(rBar.GetItemText(4));
long nMax = std::max( nW1, nW2 ) + 6; // width of the longest header + a little offset
- long nMin = rBar.LogicToPixel(Size(10, 0), MAP_APPFONT).Width();
+ long nMin = rBar.LogicToPixel(Size(10, 0), MapUnit::MapAppFont).Width();
nMax = std::max( nMax, nMin );
const long nDoubleMax = 2*nMax;
const long nRest = GetSizePixel().Width() - nDoubleMax;
@@ -429,7 +429,7 @@ void SvxFontSubstCheckListBox::setColSizes()
aStaticTabs[2] = nMax;
aStaticTabs[3] = nDoubleMax;
aStaticTabs[4] = nDoubleMax + nRest/2;
- SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
+ SvSimpleTable::SetTabs(aStaticTabs, MapUnit::MapPixel);
}
void SvxFontSubstCheckListBox::Resize()
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index a6c06a9c4ba4..bacba9e98b78 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -137,7 +137,7 @@ void CuiCustomMultilineEdit::KeyInput( const KeyEvent& rKeyEvent )
Size CuiCustomMultilineEdit::GetOptimalSize() const
{
- return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
+ return LogicToPixel(Size(150, GetTextHeight()), MapUnit::MapAppFont);
}
CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxItemSet& rItemSet*/ ) :
@@ -150,7 +150,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI
m_vectorOfModified(),
m_pPrefBox( VclPtr<SvSimpleTable>::Create(*m_pPrefCtrl, WB_SCROLL | WB_HSCROLL | WB_VSCROLL ) )
{
- Size aControlSize(LogicToPixel(Size(385, 230), MAP_APPFONT));
+ Size aControlSize(LogicToPixel(Size(385, 230), MapUnit::MapAppFont));
m_pPrefCtrl->set_width_request(aControlSize.Width());
m_pPrefCtrl->set_height_request(aControlSize.Height());
@@ -179,7 +179,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI
m_options.searchFlag |= (util::SearchFlags::REG_NOT_BEGINOFLINE |
util::SearchFlags::REG_NOT_ENDOFLINE);
- m_pPrefBox->SetTabs(aTabs, MAP_PIXEL);
+ m_pPrefBox->SetTabs(aTabs, MapUnit::MapPixel);
m_pPrefBox->SetAlternatingRowColors( true );
}
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index d3c9fc1002c8..6e791c8911ca 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -158,7 +158,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet
get( aShadingRB, "shading" );
Size aControlSize(248, 55);
- aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+ aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
m_pCheckLBContainer->set_width_request(aControlSize.Width());
m_pCheckLBContainer->set_height_request(aControlSize.Height());
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 9ddc4fff0cf8..c8bb0cb241eb 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -108,7 +108,7 @@ public:
if (rBar.GetItemCount() < 4)
return;
long nCheckWidth = std::max(GetControlColumnWidth() + 12,
- rBar.LogicToPixel(Size(15, 0), MAP_APPFONT).Width());
+ rBar.LogicToPixel(Size(15, 0), MapUnit::MapAppFont).Width());
long nVersionWidth = 12 +
std::max(rBar.GetTextWidth(rBar.GetItemText(3)),
GetTextWidth("0.0.0_00-icedtea"));
@@ -123,7 +123,7 @@ public:
aStaticTabs[2] = nCheckWidth;
aStaticTabs[3] = aStaticTabs[2] + nVendorWidth;
aStaticTabs[4] = aStaticTabs[3] + nVersionWidth;
- SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
+ SvSimpleTable::SetTabs(aStaticTabs, MapUnit::MapPixel);
}
virtual void Resize() override
{
@@ -163,7 +163,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet&
SvSimpleTableContainer *pJavaListContainer = get<SvSimpleTableContainer>("javas");
Size aControlSize(177, 60);
- aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+ aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
pJavaListContainer->set_width_request(aControlSize.Width());
pJavaListContainer->set_height_request(aControlSize.Height());
m_pJavaList = VclPtr<SvxJavaListBox>::Create(*pJavaListContainer, m_sAccessibilityText);
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index fc9f3c612240..6e3c09993cff 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1816,7 +1816,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rD
get(m_pPrioDownPB, "down");
get(m_pPrioUpPB, "up");
get(m_pModulesCLB, "lingudicts");
- Size aListSize(m_pModulesCLB->LogicToPixel(Size(166, 120), MAP_APPFONT));
+ Size aListSize(m_pModulesCLB->LogicToPixel(Size(166, 120), MapUnit::MapAppFont));
m_pModulesCLB->set_height_request(aListSize.Height());
m_pModulesCLB->set_width_request(aListSize.Width());
get(m_pLanguageLB, "language");
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 88d7fd5b6eb8..f3511513f88b 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -204,7 +204,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
m_pPathBtn->SetClickHdl( LINK( this, SvxPathTabPage, PathHdl_Impl ) );
Size aControlSize(236 , 147);
- aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+ aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
m_pPathCtrl->set_width_request(aControlSize.Width());
m_pPathCtrl->set_height_request(aControlSize.Height());
WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP;
@@ -227,7 +227,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
long aTabs[] = {3, 0, 0, 0};
aTabs[2] = nWidth1 + 12;
aTabs[3] = aTabs[2] + nWidth2 + 12;
- pPathBox->SetTabs(aTabs, MAP_PIXEL);
+ pPathBox->SetTabs(aTabs, MapUnit::MapPixel);
pPathBox->SetDoubleClickHdl( LINK( this, SvxPathTabPage, DoubleClickPathHdl_Impl ) );
pPathBox->SetSelectHdl( LINK( this, SvxPathTabPage, PathSelect_Impl ) );
@@ -342,7 +342,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
long aTabs[] = {3, 0, 0, 0};
aTabs[2] = nWidth1 + 12;
aTabs[3] = aTabs[2] + nWidth2 + 12;
- pPathBox->SetTabs(aTabs, MAP_PIXEL);
+ pPathBox->SetTabs(aTabs, MapUnit::MapPixel);
#if 0
String aUserData = GetUserData();
@@ -716,7 +716,7 @@ IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
long _nWidth = pBar->GetItemSize(i);
aSz.Width() = _nWidth + nTmpSz;
nTmpSz += _nWidth;
- pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width() );
+ pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MapUnit::MapAppFont) ).Width() );
}
}
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 716bb2a253e1..3ecfdf624a84 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -498,7 +498,7 @@ void OfaTreeOptionsDialog::InitWidgets()
get(pBackPB, "revert");
get(pTreeLB, "pages");
get(pTabBox, "box");
- Size aSize(pTabBox->LogicToPixel(Size(278, 259), MAP_APPFONT));
+ Size aSize(pTabBox->LogicToPixel(Size(278, 259), MapUnit::MapAppFont));
pTabBox->set_width_request(aSize.Width());
pTabBox->set_height_request(aSize.Height() - get_action_area()->get_preferred_size().Height());
pTreeLB->set_width_request(pTreeLB->approximate_char_width() * 25);
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 21ed6daa0e88..d9473ea8f7ab 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -96,7 +96,7 @@ void PasswordTable::setColWidths()
GetSizePixel().Width() - nUserNameWidth);
long aStaticTabs[]= { 2, 0, 0 };
aStaticTabs[2] = nWebSiteWidth;
- SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
+ SvSimpleTable::SetTabs(aStaticTabs, MapUnit::MapPixel);
}
// class WebConnectionInfoDialog -----------------------------------------