chart2/source/view/main/VButton.cxx | 2 +
sc/source/filter/oox/worksheethelper.cxx | 10 +++---
solenv/flatpak-manifest.in | 2 -
vcl/win/gdi/salnativewidgets-luna.cxx | 51 +++++++++++++++++++++++--------
4 files changed, 47 insertions(+), 18 deletions(-)
New commits:
commit fccf616e2caf2cc550857ea47c77b1ef20bc67ca
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date: Wed May 16 12:36:28 2018 +0900
tdf#117596 set the size for Asian and Complex char height too
Change-Id: I703fc4d1cf34747d924a7fa44913a4bfe9bff67b
Reviewed-on: https://gerrit.libreoffice.org/54406
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit d57c6f5d44ec7a8dff2121bd19103804329af66a)
Reviewed-on: https://gerrit.libreoffice.org/54408
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit e822afc4989451674ae51df0d3e5ca233e8fd5fa)
diff --git a/chart2/source/view/main/VButton.cxx
b/chart2/source/view/main/VButton.cxx
index 0f4e2bd534ae..b31bdd0c4034 100644
--- a/chart2/source/view/main/VButton.cxx
+++ b/chart2/source/view/main/VButton.cxx
@@ -109,6 +109,8 @@ void VButton::createShapes(const
uno::Reference<beans::XPropertySet>& xTextProp)
tPropertyNameValueMap aTextValueMap;
aTextValueMap["CharHeight"] <<= 10.0f;
+ aTextValueMap["CharHeightAsian"] <<= 10.0f;
+ aTextValueMap["CharHeightComplex"] <<= 10.0f;
aTextValueMap["FillColor"] <<= m_nBGColor;
aTextValueMap["FillStyle"] <<= drawing::FillStyle_SOLID;
aTextValueMap["LineColor"] <<= sal_Int32(0xcccccc);
commit b184bee298e20a976712397a2d258e1dd7b028f0
Author: Eike Rathke <er...@redhat.com>
Date: Mon May 14 14:38:36 2018 +0200
Related: tdf#116939 Disable <cols><col> overflow detection due to excess ...
... custom column widths.
It's probably just confusing to users, even if technically
correct. Live with truncation of a "layout form" if no content is
present.
Change-Id: I43d77c3e019badd053cb21d92aacd64c7bbcf0e6
Reviewed-on: https://gerrit.libreoffice.org/54319
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit f72bd4f02b70e1c4855795b4237e2965556c4689)
Reviewed-on: https://gerrit.libreoffice.org/54332
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit a49200d976b8dc0a33d5d1f3a3e52bf2e97828f2)
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index 6af0e32a1e80..24df7a71a83d 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -772,9 +772,6 @@ void WorksheetGlobals::setColumnModel( const ColumnModel&
rModel )
--nLastCol;
// This is totally fouled up. If we saved 1025 and the file is saved
// with Excel again, it increments the value to 1026.
- /* TODO: we may have to completely ignore the very last
- * <cols><col ... max=...></cols> value and use checkCol(...,false) on
- * that, if it turns out that Excel stores arbitrary columns. */
else if (nLastCol == mrMaxApiPos.Col() + 2)
nLastCol -= 2;
// Excel may add a column range for the remaining columns (with
@@ -784,7 +781,12 @@ void WorksheetGlobals::setColumnModel( const ColumnModel&
rModel )
// the range that should be caught anyway.
else if (nLastCol == getAddressConverter().getMaxXlsAddress().Col())
nLastCol = mrMaxApiPos.Col();
- else if( !getAddressConverter().checkCol( nLastCol, true ) )
+ // User may have applied custom column widths to arbitrary excess
+ // columns. Ignore those and don't track as overflow columns (false).
+ // Effectively this does the same as the above cases, just keep them
+ // for explanation.
+ // Actual data present should trigger the overflow detection later.
+ else if( !getAddressConverter().checkCol( nLastCol, false ) )
nLastCol = mrMaxApiPos.Col();
// try to find entry in column model map that is able to merge with
the passed model
bool bInsertModel = true;
commit 2dbde06ab7dd730bf2ecbeb80103379fa9dddb29
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon May 14 09:34:52 2018 +0200
tdf#96947 vcl opengl win: fix background of menu items w/ check/radio marks
Extract the actually used bounding box from the rendering code and reuse
that for OpenGL texture purposes, so the available and the used size
can't mismatch.
The background itself is almost invisible, but the borders were lost due
to this size difference.
(cherry picked from commit b160db926b574b7e9d6696d49dbbce8dd289aade)
Change-Id: I31b3e5aa0c0106461b90bfaab3a84d45b33afd71
Reviewed-on: https://gerrit.libreoffice.org/54324
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 96bb95e64240ddeb59d623d62fa30b2a7191bfc4)
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx
b/vcl/win/gdi/salnativewidgets-luna.cxx
index 73e780ca1584..2370efcfec69 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -498,6 +498,31 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool
bHorizontal )
}
}
+/**
+ * Gives the actual rectangle used for rendering by ControlType::MenuPopup's
+ * ControlPart::MenuItemCheckMark or ControlPart::MenuItemRadioMark.
+ */
+static tools::Rectangle GetMenuPopupMarkRegion(const ImplControlValue& rValue)
+{
+ tools::Rectangle aRet;
+
+ const MenupopupValue& rMVal(static_cast<const MenupopupValue&>(rValue));
+ aRet.Top() = rMVal.maItemRect.Top();
+ aRet.Bottom() = rMVal.maItemRect.Bottom() + 1; // see below in
drawNativeControl
+ if (AllSettings::GetLayoutRTL())
+ {
+ aRet.Right() = rMVal.maItemRect.Right() + 1;
+ aRet.Left() = aRet.Right() - (rMVal.getNumericVal() -
rMVal.maItemRect.Left());
+ }
+ else
+ {
+ aRet.Right() = rMVal.getNumericVal();
+ aRet.Left() = rMVal.maItemRect.Left();
+ }
+
+ return aRet;
+}
+
bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
ControlType nType,
ControlPart nPart,
@@ -1088,19 +1113,11 @@ bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme,
RECT rc,
RECT aBGRect = rc;
if( aValue.getType() == ControlType::MenuPopup )
{
- const MenupopupValue& rMVal( static_cast<const
MenupopupValue&>(aValue) );
- aBGRect.top = rMVal.maItemRect.Top();
- aBGRect.bottom = rMVal.maItemRect.Bottom()+1; // see
below in drawNativeControl
- if( AllSettings::GetLayoutRTL() )
- {
- aBGRect.right = rMVal.maItemRect.Right()+1;
- aBGRect.left = aBGRect.right -
(rMVal.getNumericVal()-rMVal.maItemRect.Left());
- }
- else
- {
- aBGRect.right = rMVal.getNumericVal();
- aBGRect.left = rMVal.maItemRect.Left();
- }
+ tools::Rectangle aRectangle =
GetMenuPopupMarkRegion(aValue);
+ aBGRect.top = aRectangle.Top();
+ aBGRect.left = aRectangle.Left();
+ aBGRect.bottom = aRectangle.Bottom();
+ aBGRect.right = aRectangle.Right();
rc = aBGRect;
}
iState = (nState & ControlState::ENABLED) ? MCB_NORMAL :
MCB_DISABLED;
@@ -1164,6 +1181,14 @@ bool WinSalGraphics::drawNativeControl( ControlType
nType,
}
}
+ if (pImpl && nType == ControlType::MenuPopup && (nPart ==
ControlPart::MenuItemCheckMark || nPart == ControlPart::MenuItemRadioMark))
+ {
+ cacheRect = GetMenuPopupMarkRegion(aValue);
+ buttonRect = cacheRect;
+ keySize = cacheRect.GetSize();
+ }
+
+
ControlCacheKey aControlCacheKey(nType, nPart, nState, keySize);
if (pImpl != nullptr &&
pImpl->TryRenderCachedNativeControl(aControlCacheKey, buttonRect.Left(),
buttonRect.Top()))
{
commit 47d735dff2d9f373945496666e235f266fa62eeb
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon May 14 16:58:14 2018 +0200
Merge in Flatpak improvements
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>:
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon May 14 16:51:37 2018 +0200
Find flatpak'ed Java installation via JAVA_HOME
...instead of via PATH, so that a JAVA_HOME inherited from the
environment
doesn't accidentally select a different Java installation. Fixes
<https://github.com/flathub/org.libreoffice.LibreOffice/issues/37>
"undefined
symbol: FT_Done_MM_Var".
Change-Id: I2b4c3a55c92f0ef5c5925f0a9909b7b061eedeeb
Reviewed-on: https://gerrit.libreoffice.org/54331
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit ef389eb874e29dba91be55acdbe238396687ec54)
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 2134b139c7d6..c22d921f91dc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -592,8 +592,8 @@
"--device=dri",
"--filesystem=host",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+ "--env=JAVA_HOME=/app/jre",
"--env=LIBO_FLATPAK=1",
- "--env=PATH=/usr/bin:/app/jre/bin",
"--own-name=org.libreoffice.LibreOfficeIpc0",
"--talk-name=ca.desrt.dconf",
"--talk-name=org.gtk.vfs.*"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
