summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basctl/source/basicide/baside2b.cxx2
-rw-r--r--cui/source/options/certpath.cxx2
-rw-r--r--cui/source/options/fontsubs.cxx2
-rw-r--r--dbaccess/source/ui/control/sqledit.cxx2
-rw-r--r--sfx2/source/appl/appcfg.cxx6
-rw-r--r--sfx2/source/view/viewfrm.cxx2
-rw-r--r--sw/source/uibase/docvw/srcedtw.cxx2
-rw-r--r--unotools/source/config/historyoptions.cxx2
-rw-r--r--vcl/qt5/Qt5Frame.cxx2
-rw-r--r--vcl/source/control/notebookbar.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
-rw-r--r--vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx4
-rw-r--r--vcl/win/gdi/salnativewidgets-luna.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.cxx2
14 files changed, 17 insertions, 17 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 25633088e9eb..a5baaed5f100 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1208,7 +1208,7 @@ void EditorWindow::UpdateSyntaxHighlighting ()
void EditorWindow::ImplSetFont()
{
- OUString sFontName(officecfg::Office::Common::Font::SourceViewFont::FontName::get().get_value_or(OUString()));
+ OUString sFontName(officecfg::Office::Common::Font::SourceViewFont::FontName::get().value_or(OUString()));
if (sFontName.isEmpty())
{
vcl::Font aTmpFont(OutputDevice::GetDefaultFont(DefaultFontType::FIXED,
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 5416a5488eee..b98811dc4827 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -92,7 +92,7 @@ CertPathDialog::CertPathDialog(weld::Window* pParent)
try
{
- AddManualCertPath(officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString()));
+ AddManualCertPath(officecfg::Office::Common::Security::Scripting::CertDir::get().value_or(OUString()));
if (m_sManualPath.isEmpty())
AddManualCertPath(officecfg::Office::Common::Security::Scripting::ManualCertDir::get(), false);
}
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 4cedb534c6f9..20baf823cb69 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -225,7 +225,7 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* )
NonPropFontsHdl(*m_xNonPropFontsOnlyCB);
OUString sFontName(
officecfg::Office::Common::Font::SourceViewFont::FontName::get().
- get_value_or(OUString()));
+ value_or(OUString()));
if(!sFontName.isEmpty())
m_xFontNameLB->set_active_text(sFontName);
else
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index e5b9706194a9..e494b452c325 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -231,7 +231,7 @@ void OSqlEdit::ImplSetFont()
StyleSettings aStyleSettings = aSettings.GetStyleSettings();
OUString sFontName(
officecfg::Office::Common::Font::SourceViewFont::FontName::get().
- get_value_or( OUString() ) );
+ value_or( OUString() ) );
if ( sFontName.isEmpty() )
{
vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DefaultFontType::FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), GetDefaultFontFlags::NONE, this ) );
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 8b9ca9e6f413..44065b512989 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -350,7 +350,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
SfxUInt16Item(
rPool.GetWhich(SID_INET_PROXY_TYPE),
(officecfg::Inet::Settings::ooInetProxyType::
- get().get_value_or(0)))))
+ get().value_or(0)))))
{
bRet = true;
}
@@ -370,7 +370,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
SfxInt32Item(
rPool.GetWhich(SID_INET_HTTP_PROXY_PORT),
(officecfg::Inet::Settings::
- ooInetHTTPProxyPort::get().get_value_or(0)))))
+ ooInetHTTPProxyPort::get().value_or(0)))))
{
bRet = true;
}
@@ -390,7 +390,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
SfxInt32Item(
rPool.GetWhich(SID_INET_FTP_PROXY_PORT),
(officecfg::Inet::Settings::ooInetFTPProxyPort::
- get().get_value_or(0)))))
+ get().value_or(0)))))
{
bRet = true;
}
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 9b7c763a8eb2..6c0ee872eaf6 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1296,7 +1296,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
OUString sSetupVersion = utl::ConfigManager::getProductVersion();
sal_Int32 iCurrent = sSetupVersion.getToken(0,'.').toInt32() * 10 + sSetupVersion.getToken(1,'.').toInt32();
OUString sLastVersion
- = officecfg::Setup::Product::ooSetupLastVersion::get().get_value_or("0.0");
+ = officecfg::Setup::Product::ooSetupLastVersion::get().value_or("0.0");
sal_Int32 iLast = sLastVersion.getToken(0,'.').toInt32() * 10 + sLastVersion.getToken(1,'.').toInt32();
if ((iCurrent > iLast) && !Application::IsHeadlessModeEnabled() && !bIsUITest)
{
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index cc0793e372e6..1cab7fc278f9 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -953,7 +953,7 @@ void SwSrcEditWindow::SetFont()
{
OUString sFontName(
officecfg::Office::Common::Font::SourceViewFont::FontName::get().
- get_value_or(OUString()));
+ value_or(OUString()));
if(sFontName.isEmpty())
{
LanguageType aLanguages[5] =
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 5b17c4e927af..164731398716 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -434,7 +434,7 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory,
xSet->setPropertyValue(s_sFilter, uno::makeAny(sFilter));
xSet->setPropertyValue(s_sTitle, uno::makeAny(sTitle));
xSet->setPropertyValue(s_sPassword, uno::makeAny(OUString()));
- xSet->setPropertyValue(s_sThumbnail, uno::makeAny(sThumbnail.get_value_or(OUString())));
+ xSet->setPropertyValue(s_sThumbnail, uno::makeAny(sThumbnail.value_or(OUString())));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 2ca319ee515c..21916ee56f13 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1015,7 +1015,7 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
Color aMenuBack = toColor(qMenuCG.color(QPalette::Window));
style.SetMenuTextColor(aMenuFore);
- style.SetMenuBarTextColor(style.GetPersonaMenuBarTextColor().get_value_or(aMenuFore));
+ style.SetMenuBarTextColor(style.GetPersonaMenuBarTextColor().value_or(aMenuFore));
style.SetMenuColor(aMenuBack);
style.SetMenuBarColor(aMenuBack);
style.SetMenuHighlightColor(toColor(qMenuCG.color(QPalette::Highlight)));
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index b178962f5d11..6ddc1c662c91 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -262,7 +262,7 @@ void NotebookBar::UpdatePersonaSettings()
AllSettings aAllSettings( GetSettings() );
StyleSettings aStyleSet( aAllSettings.GetStyleSettings() );
- ::Color aTextColor = aStyleSet.GetPersonaMenuBarTextColor().get_value_or(COL_BLACK );
+ ::Color aTextColor = aStyleSet.GetPersonaMenuBarTextColor().value_or(COL_BLACK );
aStyleSet.SetDialogTextColor( aTextColor );
aStyleSet.SetButtonTextColor( aTextColor );
aStyleSet.SetRadioCheckTextColor( aTextColor );
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 8b8f029b1897..2ffb60b4999b 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2357,7 +2357,7 @@ void X11SalFrame::UpdateSettings( AllSettings& rSettings )
{
StyleSettings aStyleSettings = rSettings.GetStyleSettings();
aStyleSettings.SetCursorBlinkTime( 500 );
- aStyleSettings.SetMenuBarTextColor( aStyleSettings.GetPersonaMenuBarTextColor().get_value_or( COL_BLACK ) );
+ aStyleSettings.SetMenuBarTextColor( aStyleSettings.GetPersonaMenuBarTextColor().value_or( COL_BLACK ) );
rSettings.SetStyleSettings( aStyleSettings );
}
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 6988f87df0f3..8a2e998f4e74 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -3145,13 +3145,13 @@ bool GtkSalGraphics::updateSettings(AllSettings& rSettings)
style_context_set_state(mpMenuBarItemStyle, GTK_STATE_FLAG_NORMAL);
gtk_style_context_get_color( mpMenuBarItemStyle, gtk_style_context_get_state(mpMenuBarItemStyle), &text_color );
- aTextColor = aStyleSet.GetPersonaMenuBarTextColor().get_value_or( getColor( text_color ) );
+ aTextColor = aStyleSet.GetPersonaMenuBarTextColor().value_or( getColor( text_color ) );
aStyleSet.SetMenuBarTextColor( aTextColor );
aStyleSet.SetMenuBarRolloverTextColor( aTextColor );
style_context_set_state(mpMenuBarItemStyle, GTK_STATE_FLAG_PRELIGHT);
gtk_style_context_get_color( mpMenuBarItemStyle, gtk_style_context_get_state(mpMenuBarItemStyle), &text_color );
- aTextColor = aStyleSet.GetPersonaMenuBarTextColor().get_value_or( getColor( text_color ) );
+ aTextColor = aStyleSet.GetPersonaMenuBarTextColor().value_or( getColor( text_color ) );
aStyleSet.SetMenuBarHighlightTextColor( aTextColor );
// menu items
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx
index ffba4b35ed85..41189555e55a 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -1538,7 +1538,7 @@ void WinSalGraphics::updateSettingsNative( AllSettings& rSettings )
pSVData->maNWFData.mbDockingAreaAvoidTBFrames = true;
// FIXME get the color directly from the theme, not from the settings
- Color aMenuBarTextColor = aStyleSettings.GetPersonaMenuBarTextColor().get_value_or( aStyleSettings.GetMenuTextColor() );
+ Color aMenuBarTextColor = aStyleSettings.GetPersonaMenuBarTextColor().value_or( aStyleSettings.GetMenuTextColor() );
// in aero menuitem highlight text is drawn in the same color as normal
aStyleSettings.SetMenuHighlightTextColor( aStyleSettings.GetMenuTextColor() );
aStyleSettings.SetMenuBarRolloverTextColor( aMenuBarTextColor );
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 4288e1ed426d..e268e6e25d63 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -250,7 +250,7 @@ OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponen
try
{
OUString sUserSetCertPath =
- officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString());
+ officecfg::Office::Common::Security::Scripting::CertDir::get().value_or(OUString());
if (!sUserSetCertPath.isEmpty())
{
generated by cgit (git 2.34.1) at 2024-06-11 03:29:34 +0000