|
 |
f325b2 |
From 8e392047f43791e6876e21f4e4a9deccc92f734a Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 17 Nov 2015 17:14:58 +0100
|
|
|
f325b2 |
Subject: [PATCH 340/398] sw lok comments: fix meta author/data size with
|
|
|
f325b2 |
custom zoom
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I3310813c971aa7abffccc0b7f462e05caa83482e
|
|
|
f325b2 |
(cherry picked from commit 6d00110674452c66ca6192fbf46b41331b2c7066)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sw/source/uibase/docvw/SidebarWin.cxx | 5 +++--
|
|
|
f325b2 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
f325b2 |
index 693bcdf5b09a..9d12a12eae35 100644
|
|
|
f325b2 |
--- a/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
f325b2 |
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
f325b2 |
@@ -669,11 +669,12 @@ void SwSidebarWin::Rescale()
|
|
|
f325b2 |
mpOutliner->SetRefMapMode( aMode );
|
|
|
f325b2 |
SetMapMode( aMode );
|
|
|
f325b2 |
mpSidebarTextControl->SetMapMode( aMode );
|
|
|
f325b2 |
+ const Fraction& rFraction = mrView.GetWrtShellPtr()->GetOut()->GetMapMode().GetScaleY();
|
|
|
f325b2 |
if ( mpMetadataAuthor )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
vcl::Font aFont( mpMetadataAuthor->GetSettings().GetStyleSettings().GetFieldFont() );
|
|
|
f325b2 |
sal_Int32 nHeight = aFont.GetHeight();
|
|
|
f325b2 |
- nHeight = nHeight * aMode.GetScaleY().GetNumerator() / aMode.GetScaleY().GetDenominator();
|
|
|
f325b2 |
+ nHeight = nHeight * rFraction.GetNumerator() / rFraction.GetDenominator();
|
|
|
f325b2 |
aFont.SetHeight( nHeight );
|
|
|
f325b2 |
mpMetadataAuthor->SetControlFont( aFont );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -681,7 +682,7 @@ void SwSidebarWin::Rescale()
|
|
|
f325b2 |
{
|
|
|
f325b2 |
vcl::Font aFont( mpMetadataDate->GetSettings().GetStyleSettings().GetFieldFont() );
|
|
|
f325b2 |
sal_Int32 nHeight = aFont.GetHeight();
|
|
|
f325b2 |
- nHeight = nHeight * aMode.GetScaleY().GetNumerator() / aMode.GetScaleY().GetDenominator();
|
|
|
f325b2 |
+ nHeight = nHeight * rFraction.GetNumerator() / rFraction.GetDenominator();
|
|
|
f325b2 |
aFont.SetHeight( nHeight );
|
|
|
f325b2 |
mpMetadataDate->SetControlFont( aFont );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|