README.md | 4 ++--
configure.ac | 4 ++--
extensions/source/propctrlr/fontdialog.cxx | 14 ++++++++++----
3 files changed, 14 insertions(+), 8 deletions(-)
New commits:
commit 894e542a5d629b5d64841265aa0cc0309533049b
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Jan 8 21:56:11 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Jan 12 13:12:02 2025 +0100
bump minimum Xcode version to 14.3 (and that in turn requries macOS 13)
poppler ( e28c5a2c93477d167eb449f08eca220cb3b26b31 ) uses std::ranges
stuff that's not supported in earlier version of Xcode (see also
https://developer.apple.com/xcode/cpp/ )
Change-Id: I340180f32c195547a1f93d271e5bbc59252198e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179973
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/README.md b/README.md
index b3e4e4a515cd..b176bb6a1cb1 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,8 @@ run and compile LibreOffice, also used by the TDF builds:
* Runtime: Windows 7
* Build: Cygwin + Visual Studio 2019 version 16.10
* macOS:
- * Runtime: 10.15
- * Build: 12 (13 for aarch64) + Xcode 14
+ * Runtime: 10.15 (11 for aarch64)
+ * Build: 13 or later + Xcode 14.3 or later (using latest version available
for a given versino of macOS)
* Linux:
* Runtime: RHEL 8 or CentOS 8 and comparable
* Build: either GCC 12; or Clang 12 with libstdc++ 10
diff --git a/configure.ac b/configure.ac
index 4998b2d1e3be..40d56e6ecf7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3661,7 +3661,7 @@ if test $_os = Darwin; then
my_xcode_ver1=$(xcrun xcodebuild -version | head -n 1)
my_xcode_ver2=${my_xcode_ver1#Xcode }
my_xcode_ver3=$(printf %s "$my_xcode_ver2" | $AWK -F. '{ print
$1*100+($2<100?$2:99) }')
- if test "$my_xcode_ver3" -ge 1205; then
+ if test "$my_xcode_ver3" -ge 1403; then
AC_MSG_RESULT([yes ($my_xcode_ver2)])
if test $MAC_OS_X_VERSION_MIN_REQUIRED -lt 120000; then
if test "$my_xcode_ver3" -eq 1500; then
@@ -3673,7 +3673,7 @@ if test $_os = Darwin; then
fi
fi
else
- AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at
least Xcode 12.5])
+ AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at
least Xcode 14.3])
fi
my_xcode_ver1=$(xcrun xcodebuild -version | tail -n 1)
commit 7e8d34d4e5791f917f2aff3e7f9c4a79d5769613
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Jan 10 14:22:05 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Jan 12 13:11:52 2025 +0100
tdf#164037 Check property exists before accessing it
Only call XPropertySet::getPropertyValue with
PROPERTY_STANDARD_THEME if the property set actually
has such a property.
This amends
commit 2bf3cada925ca49e3ac6a249ec6c342954739986
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Fri Aug 2 15:09:54 2024 +0200
tdf#153343 Show settings for the actual default font in control
properties
Otherwise, calling XPropertySet::getPropertyValue triggers
an UnknownPropertyException in OPropertySetHelper::getPropertyValue
for the tdf#164037 sample macro dialog and the actual font
properties are not shown in the dialog.
Backtrace of how UnknownPropertyException gets thrown:
1 cppu::OPropertySetHelper::getPropertyValue
propshlp.cxx 276 0x7fc251385a68
2 non-virtual thunk to
cppu::OPropertySetHelper::getPropertyValue(rtl::OUString const&)
0x7fc251385bac
3 pcr::ControlCharacterDialog::translatePropertiesToItems
fontdialog.cxx 232 0x7fc210c32b15
4 pcr::FormComponentPropertyHandler::impl_executeFontDialog_nothrow
formcomponenthandler.cxx 2839 0x7fc210c4ccde
5 pcr::FormComponentPropertyHandler::onInteractivePropertySelection
formcomponenthandler.cxx 1435 0x7fc210c49abd
6 pcr::OPropertyBrowserController::Clicked
propcontroller.cxx 1259 0x7fc210cf3352
7 pcr::OBrowserListBox::buttonClicked
browserlistbox.cxx 540 0x7fc210b9f19c
8 pcr::OBrowserLine::OnButtonClicked
browserline.cxx 383 0x7fc210b969e0
9 pcr::OBrowserLine::LinkStubOnButtonClicked
browserline.cxx 380 0x7fc210b9631d
10 Link<weld::Button&, void>::Call
link.hxx 101 0x7fc24a462971
11 weld::Button::signal_clicked
weld.hxx 1557 0x7fc24a43e78c
12 SalInstanceButton::ClickHdl
salvtables.cxx 2955 0x7fc24a40f9b8
13 SalInstanceButton::LinkStubClickHdl
salvtables.cxx 2943 0x7fc24a40ef0d
14 Link<Button *, void>::Call
link.hxx 101 0x7fc249d154b1
15 Button::Click()::$_0::operator()() const
button.cxx 130 0x7fc249d0cd02
16 std::__invoke_impl<void,
Button::Click()::$_0&>(std::__invoke_other, Button::Click()::$_0&) invoke.h
61 0x7fc249d0ccd5
17 std::__invoke_r<void, Button::Click()::$_0&>(Button::Click()::$_0&)
invoke.h 111 0x7fc249d0cc85
18 std::_Function_handler<void(), Button::Click()::$_0>::_M_invoke
std_function.h 290 0x7fc249d0cbad
19 std::function<void()>::operator()
std_function.h 591 0x7fc249d36f1e
20 Control::ImplCallEventListenersAndHandler
ctrl.cxx 311 0x7fc249d350db
... <More>
Change-Id: I2d34c2152238e2439e24e561435d6d6b5a1a985a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180073
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit 9dd21ea57a8e098f994a4c65d299480f5211a18e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180076
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/extensions/source/propctrlr/fontdialog.cxx
b/extensions/source/propctrlr/fontdialog.cxx
index 59ca37b08eda..2adab8f069ba 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -226,10 +226,16 @@ namespace pcr
// if PROPERTY_STANDARD_THEME is set, use style settings
independent of platform (theme)
// KEEP IN SYNC WITH UnoControl::createPeer
- bool bStandardTheme = false;
- css::uno::Any aAnyStandardTheme =
_rxModel->getPropertyValue(PROPERTY_STANDARD_THEME);
- if ((aAnyStandardTheme >>= bStandardTheme) && bStandardTheme)
- aStyleSettings.SetStandardStyles();
+ css::uno::Reference<css::beans::XPropertySetInfo> xPropSetInfo
+ = _rxModel->getPropertySetInfo();
+ if (xPropSetInfo.is() &&
xPropSetInfo->hasPropertyByName(PROPERTY_STANDARD_THEME))
+ {
+ bool bStandardTheme = false;
+ css::uno::Any aAnyStandardTheme
+ = _rxModel->getPropertyValue(PROPERTY_STANDARD_THEME);
+ if ((aAnyStandardTheme >>= bStandardTheme) && bStandardTheme)
+ aStyleSettings.SetStandardStyles();
+ }
const vcl::Font aDefaultVCLFont = aStyleSettings.GetAppFont();
css::awt::FontDescriptor aDefaultFont =
VCLUnoHelper::CreateFontDescriptor(aDefaultVCLFont);
