summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/newhelp.cxx14
-rw-r--r--sfx2/source/dialog/dialoghelper.cxx4
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx8
-rw-r--r--sfx2/source/dialog/versdlg.cxx4
-rw-r--r--sfx2/source/doc/new.cxx4
-rw-r--r--sfx2/source/doc/objembed.cxx4
-rw-r--r--sfx2/source/doc/printhelper.cxx2
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx6
-rw-r--r--sfx2/source/sidebar/SidebarChildWindow.cxx2
-rw-r--r--sfx2/source/view/classificationcontroller.cxx2
10 files changed, 25 insertions, 25 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 4b8e33a2d980..93ea92fe6d08 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -434,7 +434,7 @@ ContentTabPage_Impl::ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindo
"sfx/ui/helpcontentpage.ui")
{
get(m_pContentBox, "content");
- Size aSize(LogicToPixel(Size(108 , 188), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(108 , 188), MapMode(MapUnit::MapAppFont)));
m_pContentBox->set_width_request(aSize.Width());
m_pContentBox->set_height_request(aSize.Height());
}
@@ -542,7 +542,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Im
, bIsActivated(false)
{
get(m_pIndexCB, "terms");
- Size aSize(LogicToPixel(Size(108, 97), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(108, 97), MapMode(MapUnit::MapAppFont)));
m_pIndexCB->set_width_request(aSize.Width());
m_pIndexCB->set_height_request(aSize.Height());
get(m_pOpenBtn, "display");
@@ -912,7 +912,7 @@ SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_
get(m_pFullWordsCB, "completewords");
get(m_pScopeCB, "headings");
get(m_pResultsLB, "results");
- Size aSize(LogicToPixel(Size(128 , 30), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(128 , 30), MapMode(MapUnit::MapAppFont)));
m_pResultsLB->set_width_request(aSize.Width());
m_pResultsLB->set_height_request(aSize.Height());
get(m_pOpenBtn, "display");
@@ -1271,7 +1271,7 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl(vcl::Window* pParent, SfxHelpIndexW
{
get(m_pBookmarksPB, "display");
get(m_pBookmarksBox, "bookmarks");
- Size aSize(LogicToPixel(Size(120 , 200), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(120 , 200), MapMode(MapUnit::MapAppFont)));
m_pBookmarksBox->set_width_request(aSize.Width());
m_pBookmarksBox->set_height_request(aSize.Height());
@@ -1870,7 +1870,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
bIsInClose ( false ),
bIsFullWordSearch ( false )
{
- aOnStartupCB->SetSizePixel(aOnStartupCB->PixelToLogic(Size(200, 10), MapUnit::MapAppFont));
+ aOnStartupCB->SetSizePixel(aOnStartupCB->PixelToLogic(Size(200, 10), MapMode(MapUnit::MapAppFont)));
sfx2::AddToTaskPaneList( aToolBox.get() );
@@ -2069,7 +2069,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox()
}
// set position of the checkbox
- Size a3Size = LogicToPixel( Size( 3, 3 ), MapUnit::MapAppFont );
+ Size a3Size = LogicToPixel(Size(3, 3), MapMode(MapUnit::MapAppFont));
Size aTBSize = aToolBox->GetSizePixel();
Size aCBSize = aOnStartupCB->GetSizePixel();
Point aPnt = aToolBox->GetPosPixel();
@@ -2944,7 +2944,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
pIndexWin = VclPtr<SfxHelpIndexWindow_Impl>::Create( this );
pIndexWin->SetDoubleClickHdl( LINK( this, SfxHelpWindow_Impl, OpenHdl ) );
pIndexWin->SetSelectFactoryHdl( LINK( this, SfxHelpWindow_Impl, SelectFactoryHdl ) );
- pIndexWin->SetSizePixel(LogicToPixel(Size(120, 200), MapUnit::MapAppFont));
+ pIndexWin->SetSizePixel(LogicToPixel(Size(120, 200), MapMode(MapUnit::MapAppFont)));
pIndexWin->Show();
pTextWin = VclPtr<SfxHelpTextWindow_Impl>::Create( this );
Reference < XFrames > xFrames = rFrame->getFrames();
diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx
index aaea7e22c1a8..89f5124d9c97 100644
--- a/sfx2/source/dialog/dialoghelper.cxx
+++ b/sfx2/source/dialog/dialoghelper.cxx
@@ -55,12 +55,12 @@ void setPreviewsToSamePlace(vcl::Window const *pParent, VclBuilderContainer *pPa
Size getParagraphPreviewOptimalSize(const vcl::Window *pReference)
{
- return pReference->LogicToPixel(Size(68 , 112), MapUnit::MapAppFont);
+ return pReference->LogicToPixel(Size(68 , 112), MapMode(MapUnit::MapAppFont));
}
Size getDrawPreviewOptimalSize(const vcl::Window *pReference)
{
- return pReference->LogicToPixel(Size(88, 42), MapUnit::MapAppFont);
+ return pReference->LogicToPixel(Size(88, 42), MapMode(MapUnit::MapAppFont));
}
Size getPreviewStripSize(const vcl::Window *pReference)
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 665de8babec5..24d6f9648382 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1387,8 +1387,8 @@ void CustomPropertiesYesNoButton::Resize()
{
Size aParentSize(GetSizePixel());
const long nWidth = aParentSize.Width();
- const long n1Width = LogicToPixel(Size(1, 1), MapUnit::MapAppFont).Width();
- const long n3Width = LogicToPixel(Size(3, 3), MapUnit::MapAppFont).Width();
+ const long n1Width = LogicToPixel(Size(1, 1), MapMode(MapUnit::MapAppFont)).Width();
+ const long n3Width = LogicToPixel(Size(3, 3), MapMode(MapUnit::MapAppFont)).Width();
const long nNewWidth = (nWidth / 2) - n3Width - 2;
Size aSize(nNewWidth, m_aYesButton->get_preferred_size().Height());
Point aPos(n1Width, (aParentSize.Height() - aSize.Height()) / 2);
@@ -1517,7 +1517,7 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,
m_nTypeBoxWidth = aSize.Width();
m_nWidgetHeight = aSize.Height();
- Point aPos(LogicToPixel(Point(0, 2), MapUnit::MapAppFont));
+ Point aPos(LogicToPixel(Point(0, 2), MapMode(MapUnit::MapAppFont)));
m_aEditLoseFocusIdle.SetPriority( TaskPriority::LOWEST );
m_aEditLoseFocusIdle.SetInvokeHandler( LINK( this, CustomPropertiesWindow, EditTimeoutHdl ) );
@@ -1962,7 +1962,7 @@ CustomPropertiesControl::CustomPropertiesControl(vcl::Window* pParent)
, m_pVertScroll(nullptr)
, m_nThumbPos(0)
{
- Size aRequest(LogicToPixel(Size(320, 141), MapUnit::MapAppFont));
+ Size aRequest(LogicToPixel(Size(320, 141), MapMode(MapUnit::MapAppFont)));
set_width_request(aRequest.Width());
}
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 5e4792aa88a8..5f32f12cc6a3 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -207,7 +207,7 @@ SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, bool bIsSaveVersion
SvSimpleTableContainer *pContainer = get<SvSimpleTableContainer>("versions");
Size aControlSize(260, 114);
- aControlSize = pContainer->LogicToPixel(aControlSize, MapUnit::MapAppFont);
+ aControlSize = pContainer->LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
pContainer->set_width_request(aControlSize.Width());
pContainer->set_height_request(aControlSize.Height());
@@ -538,7 +538,7 @@ SfxCmisVersionsDialog::SfxCmisVersionsDialog ( SfxViewFrame* pVwFrame )
SvSimpleTableContainer *pContainer = get<SvSimpleTableContainer>("versions");
Size aControlSize(260, 114);
- aControlSize = pContainer->LogicToPixel(aControlSize, MapUnit::MapAppFont);
+ aControlSize = pContainer->LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
pContainer->set_width_request(aControlSize.Width());
pContainer->set_height_request(aControlSize.Height());
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 604fb0a58f18..f750dada8395 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -63,7 +63,7 @@ void SfxPreviewBase_Impl::Resize()
Size SfxPreviewBase_Impl::GetOptimalSize() const
{
- return LogicToPixel(Size(127, 129), MapUnit::MapAppFont);
+ return LogicToPixel(Size(127, 129), MapMode(MapUnit::MapAppFont));
}
void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& rRenderContext, GDIMetaFile* pFile)
@@ -348,7 +348,7 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
pAntiImplP->get(m_pRegionLb, "categories");
pAntiImplP->get(m_pTemplateLb, "templates");
- Size aSize(m_pRegionLb->LogicToPixel(Size(127, 72), MapUnit::MapAppFont));
+ Size aSize(m_pRegionLb->LogicToPixel(Size(127, 72), MapMode(MapUnit::MapAppFont)));
m_pRegionLb->set_width_request(aSize.Width());
m_pRegionLb->set_height_request(aSize.Height());
m_pTemplateLb->set_width_request(aSize.Width());
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 7c9763b1aa8b..e4164e63a010 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -99,7 +99,7 @@ tools::Rectangle SfxObjectShell::GetVisArea( sal_uInt16 nAspect ) const
{
tools::Rectangle aRect;
aRect.SetSize( OutputDevice::LogicToLogic( Size( 5000, 5000 ),
- MapUnit::Map100thMM, GetMapUnit() ) );
+ MapMode(MapUnit::Map100thMM), MapMode(GetMapUnit())));
return aRect;
}
return tools::Rectangle();
@@ -154,7 +154,7 @@ void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescrip
FillClass( &rDesc.maClassName, &nClipFormat, &aAppName, &rDesc.maTypeName, &aShortName, SOFFICE_FILEFORMAT_CURRENT );
rDesc.mnViewAspect = ASPECT_CONTENT;
- rDesc.maSize = OutputDevice::LogicToLogic( GetVisArea().GetSize(), GetMapUnit(), MapUnit::Map100thMM );
+ rDesc.maSize = OutputDevice::LogicToLogic(GetVisArea().GetSize(), MapMode(GetMapUnit()), MapMode(MapUnit::Map100thMM));
rDesc.maDragStartPos = Point();
rDesc.maDisplayName.clear();
}
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index e5c85169c7c9..e255b4ee87ea 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -432,7 +432,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
{
// Bug 56929 - MapMode of 100mm which recalculated when
// the device is set. Additionally only set if they were really changed.
- aSetPaperSize = pPrinter->LogicToPixel( aSetPaperSize, MapUnit::Map100thMM );
+ aSetPaperSize = pPrinter->LogicToPixel(aSetPaperSize, MapMode(MapUnit::Map100thMM));
if( aSetPaperSize != pPrinter->GetPaperSizePixel() )
{
pPrinter->SetPaperSizeUser( pPrinter->PixelToLogic( aSetPaperSize ) );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 0e3fbef0ec85..56ab68ea97df 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -865,7 +865,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString&
if ( ( aArgs.get( "WinExtent" ) >>= aWinExtent )&& ( aWinExtent.getLength() == 4 ) )
{
tools::Rectangle aVisArea( aWinExtent[0], aWinExtent[1], aWinExtent[2], aWinExtent[3] );
- aVisArea = OutputDevice::LogicToLogic( aVisArea, MapUnit::Map100thMM, pObjectShell->GetMapUnit() );
+ aVisArea = OutputDevice::LogicToLogic(aVisArea, MapMode(MapUnit::Map100thMM), MapMode(pObjectShell->GetMapUnit()));
pObjectShell->SetVisArea( aVisArea );
}
@@ -956,7 +956,7 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs()
// We can store it now to overwrite an old value
// since it is not from ItemSet
tools::Rectangle aTmpRect = m_pData->m_pObjectShell->GetVisArea( ASPECT_CONTENT );
- aTmpRect = OutputDevice::LogicToLogic( aTmpRect, m_pData->m_pObjectShell->GetMapUnit(), MapUnit::Map100thMM );
+ aTmpRect = OutputDevice::LogicToLogic(aTmpRect, MapMode(m_pData->m_pObjectShell->GetMapUnit()), MapMode(MapUnit::Map100thMM));
Sequence< sal_Int32 > aRectSeq(4);
aRectSeq[0] = aTmpRect.Left();
@@ -1892,7 +1892,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
Size aSize = m_pData->m_pObjectShell->GetVisArea().GetSize();
MapUnit aMapUnit = m_pData->m_pObjectShell->GetMapUnit();
- aDesc.maSize = OutputDevice::LogicToLogic( aSize, aMapUnit, MapUnit::Map100thMM );
+ aDesc.maSize = OutputDevice::LogicToLogic(aSize, MapMode(aMapUnit), MapMode(MapUnit::Map100thMM));
aDesc.maDragStartPos = Point();
aDesc.maDisplayName.clear();
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index c9bc920ca277..7153c1d461b1 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -70,7 +70,7 @@ sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window const * pWindow)
// Width of the paragraph panel.
const static sal_Int32 nMaxPropertyPageWidth(146);
- return pWindow->LogicToPixel(Point(nMaxPropertyPageWidth,1), MapUnit::MapAppFont).X()
+ return pWindow->LogicToPixel(Point(nMaxPropertyPageWidth,1), MapMode(MapUnit::MapAppFont)).X()
+ TabBar::GetDefaultWidth() * pWindow->GetDPIScaleFactor();
}
else
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx
index 1efdb2fd523f..d334eca23688 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -281,7 +281,7 @@ void ClassificationControl::SetOptimalSize()
{
// Same as SvxColorDockingWindow.
const Size aLogicalAttrSize(150, 0);
- Size aSize(LogicToPixel(aLogicalAttrSize,MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(aLogicalAttrSize, MapMode(MapUnit::MapAppFont)));
Point aPosition = m_pCategory->GetPosPixel();
generated by cgit (git 2.34.1) at 2025-02-10 00:37:16 +0000