[Libreoffice-commits] core.git: cui/source vcl/source

[Caolán McNamara (via logerrit)]

 cui/source/options/optaboutconfig.cxx |2 ++
 vcl/source/app/salvtables.cxx |7 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit da88a1b6bb48ea6f933e1121927d2dcaeae47866
Author: Caolán McNamara 
AuthorDate: Thu Oct 15 16:51:21 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 15 20:41:34 2020 +0200

tdf#137432 only do EnableInvalidate(false) optimization when not shown

Change-Id: If7f35d19061a7a2db2e5df31227834526bbf0905
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104381
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index c6348f2023ef..fdcef5cf853d 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -791,6 +791,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, SearchHdl_Impl, 
weld::Button&, void)
 {
 weld::WaitObject aWait(m_xDialog.get());
 
+m_xPrefBox->hide();
 m_xPrefBox->clear();
 m_xPrefBox->freeze();
 
@@ -844,6 +845,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, SearchHdl_Impl, 
weld::Button&, void)
 m_xPrefBox->expand_row(rEntry);
 return false;
 });
+m_xPrefBox->show();
 }
 
 void CuiAboutConfigTabPage::InsertEntry(const prefBoxEntry& rEntry)
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 29ecc5d74dc6..a1e533e2a2bd 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3311,7 +3311,8 @@ namespace
 UpdateGuard(SvTabListBox& rTreeView)
 : m_rTreeView(rTreeView)
 , m_bOrigUpdate(m_rTreeView.IsUpdateMode())
-, 
m_bOrigEnableInvalidate(m_rTreeView.GetModel()->IsEnableInvalidate())
+// tdf#137432 only do the EnableInvalidate(false) optimization if 
the widget is currently hidden
+, m_bOrigEnableInvalidate(!m_rTreeView.IsVisible() && 
m_rTreeView.GetModel()->IsEnableInvalidate())
 {
 if (m_bOrigUpdate)
 m_rTreeView.SetUpdateMode(false);
@@ -3321,10 +3322,10 @@ namespace
 
 ~UpdateGuard()
 {
-if (m_bOrigUpdate)
-m_rTreeView.SetUpdateMode(true);
 if (m_bOrigEnableInvalidate)
 m_rTreeView.GetModel()->EnableInvalidate(true);
+if (m_bOrigUpdate)
+m_rTreeView.SetUpdateMode(true);
 }
 };
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source vcl/source

[Mike Kaganski (via logerrit)]

 cui/source/dialogs/about.cxx |   12 +---
 vcl/source/app/svapp.cxx |   30 +++---
 2 files changed, 20 insertions(+), 22 deletions(-)

New commits:
commit 8bc1dcf22df49fa1fb5c858a8f0f44143d41d6f7
Author: Mike Kaganski 
AuthorDate: Fri May 22 12:17:08 2020 +0200
Commit: Mike Kaganski 
CommitDate: Sat May 23 07:06:09 2020 +0200

Tidy up generation of Application::GetHWOSConfInfo

... so that it doesn't add "; " in the end unconditionally. This makes
version info in About dialog prettier.

Change-Id: I914b8bd808230681f768c9da679941c604fc5eab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94671
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 9dd4e108a24d..53f05d52b2e1 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -255,13 +255,11 @@ IMPL_LINK_NOARG(AboutDialog, HandleClick, weld::Button &, 
void) {
   css::datatransfer::clipboard::SystemClipboard::create(
   comphelper::getProcessComponentContext());
 
-  OUString sInfo;
-  sInfo += "Version: " + m_pVersionLabel->get_label() + "\n";
-  sInfo += "Build ID: " + GetBuildString() + "\n";
-  sInfo += m_pEnvLabel->get_label();
-  sInfo += m_pUILabel->get_label() + "\n";
-  sInfo += "Locale: " + m_pLocaleLabel->get_label() + "\n";
-  sInfo += m_pMiscLabel->get_label();
+  OUString sInfo = "Version: " + m_pVersionLabel->get_label() // version
+   + "\nBuild ID: " + GetBuildString() // build id
+   + "\n" + m_pEnvLabel->get_label() + "; " + 
m_pUILabel->get_label() // env+UI
+   + "\nLocale: " + m_pLocaleLabel->get_label() // locale
+   + "\n" + m_pMiscLabel->get_label(); // misc
 
   vcl::unohelper::TextDataObject::CopyStringTo(sInfo, xClipboard);
 }
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index fe650087d026..ea01d31c0829 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1140,10 +1140,15 @@ OUString Application::GetHWOSConfInfo(const int 
bSelection)
 ImplSVData* pSVData = ImplGetSVData();
 OUStringBuffer aDetails;
 
+const auto appendDetails = [](const OUStringLiteral& sep, auto&& 
val) {
+if (!aDetails.isEmpty() && sep.getLength())
+aDetails.append(sep);
+aDetails.append(std::move(val));
+};
+
 if (bSelection != hwUI) {
-aDetails.append( VclResId(SV_APP_CPUTHREADS) );
-aDetails.append( 
static_cast(std::thread::hardware_concurrency()) );
-aDetails.append( "; " );
+appendDetails("; ", VclResId(SV_APP_CPUTHREADS)
++ 
OUString::number(std::thread::hardware_concurrency()));
 
 OUString aVersion;
 if ( pSVData && pSVData->mpDefInst )
@@ -1151,23 +1156,21 @@ OUString Application::GetHWOSConfInfo(const int 
bSelection)
 else
 aVersion = "-";
 
-aDetails.append( VclResId(SV_APP_OSVERSION) );
-aDetails.append( aVersion );
-aDetails.append( "; " );
+appendDetails("; ", VclResId(SV_APP_OSVERSION) + aVersion);
 }
 
 if (bSelection != hwEnv) {
-aDetails.append( VclResId(SV_APP_UIRENDER) );
+appendDetails("; ", VclResId(SV_APP_UIRENDER));
 #if HAVE_FEATURE_SKIA
 if ( SkiaHelper::isVCLSkiaEnabled() )
 {
 switch(SkiaHelper::renderMethodToUse())
 {
 case SkiaHelper::RenderVulkan:
-aDetails.append( VclResId(SV_APP_SKIA_VULKAN) );
+appendDetails("", VclResId(SV_APP_SKIA_VULKAN));
 break;
 case SkiaHelper::RenderRaster:
-aDetails.append( VclResId(SV_APP_SKIA_RASTER) );
+appendDetails("", VclResId(SV_APP_SKIA_RASTER));
 break;
 }
 }
@@ -1175,16 +1178,13 @@ OUString Application::GetHWOSConfInfo(const int 
bSelection)
 #endif
 #if HAVE_FEATURE_OPENGL
 if ( OpenGLWrapper::isVCLOpenGLEnabled() )
-aDetails.append( VclResId(SV_APP_GL) );
+appendDetails("", VclResId(SV_APP_GL));
 else
 #endif
-aDetails.append( VclResId(SV_APP_DEFAULT) );
-aDetails.append( "; " );
+appendDetails("", VclResId(SV_APP_DEFAULT));
 
 #if (defined LINUX || defined _WIN32 || defined MACOSX)
-aDetails.append( SV_APP_VCLBACKEND );
-aDetails.append( GetToolkitName() );
-aDetails.append( "; " );
+appendDetails("; ", SV_APP_VCLBACKEND + GetToolkitName());
 #endif
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source vcl/source

[Tomaž Vajngerl (via logerrit)]

 cui/source/tabpages/tparea.cxx  |   77 +---
 cui/source/tabpages/tphatch.cxx |6 +--
 vcl/source/image/Image.cxx  |2 -
 3 files changed, 45 insertions(+), 40 deletions(-)

New commits:
commit 478ecc26a65188e332df2ce0ba108474c735dfd1
Author: Tomaž Vajngerl 
AuthorDate: Wed Apr 3 22:05:44 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Apr 3 17:11:21 2019 +0200

various cleanups - no behavior change

Change-Id: I28749d31ba272f26df9b79201cb106911692f6f7
Reviewed-on: https://gerrit.libreoffice.org/70199
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index c4d2c3e40864..ca97d0a07080 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -428,54 +428,59 @@ void SvxAreaTabPage::CreatePage( sal_Int32 nId, 
SfxTabPage* pTab )
 {
 if(nId == SOLID )
 {
-static_cast(pTab)->SetColorList( m_pColorList );
-static_cast(pTab)->SetColorChgd( m_pnColorListState 
);
-static_cast(pTab)->Construct();
-static_cast(pTab)->ActivatePage( m_rXFSet );
-static_cast(pTab)->Reset(_rXFSet);
-static_cast(pTab)->Show();
+auto* pColorTab = static_cast(pTab);
+pColorTab->SetColorList(m_pColorList);
+pColorTab->SetColorChgd(m_pnColorListState);
+pColorTab->Construct();
+pColorTab->ActivatePage(m_rXFSet);
+pColorTab->Reset(_rXFSet);
+pColorTab->Show();
 }
 else if(nId == GRADIENT)
 {
-static_cast(pTab)->SetColorList( m_pColorList );
-static_cast(pTab)->SetGradientList( 
m_pGradientList );
-static_cast(pTab)->SetGrdChgd( 
m_pnGradientListState );
-static_cast(pTab)->SetColorChgd( 
m_pnColorListState );
-static_cast(pTab)->Construct();
-static_cast(pTab)->ActivatePage( m_rXFSet );
-static_cast(pTab)->Reset(_rXFSet);
-static_cast(pTab)->Show();
+auto* pGradientTab = static_cast(pTab);
+pGradientTab->SetColorList(m_pColorList);
+pGradientTab->SetGradientList(m_pGradientList);
+pGradientTab->SetGrdChgd(m_pnGradientListState);
+pGradientTab->SetColorChgd(m_pnColorListState);
+pGradientTab->Construct();
+pGradientTab->ActivatePage(m_rXFSet);
+pGradientTab->Reset(_rXFSet);
+pGradientTab->Show();
 }
 else if(nId == HATCH)
 {
-static_cast(pTab)->SetColorList( m_pColorList );
-static_cast(pTab)->SetHatchingList( m_pHatchingList 
);
-static_cast(pTab)->SetHtchChgd( 
m_pnHatchingListState );
-static_cast(pTab)->SetColorChgd( m_pnColorListState 
);
-static_cast(pTab)->Construct();
-static_cast(pTab)->ActivatePage( m_rXFSet );
-static_cast(pTab)->Reset(_rXFSet);
-static_cast(pTab)->Show();
+auto* pHatchTab = static_cast(pTab);
+pHatchTab->SetColorList(m_pColorList);
+pHatchTab->SetHatchingList(m_pHatchingList);
+pHatchTab->SetHtchChgd(m_pnHatchingListState);
+pHatchTab->SetColorChgd(m_pnColorListState);
+pHatchTab->Construct();
+pHatchTab->ActivatePage(m_rXFSet);
+pHatchTab->Reset(_rXFSet);
+pHatchTab->Show();
 }
 else if(nId == BITMAP)
 {
-static_cast(pTab)->SetBitmapList( m_pBitmapList );
-static_cast(pTab)->SetBmpChgd( m_pnBitmapListState 
);
-static_cast(pTab)->Construct();
-static_cast(pTab)->ActivatePage( m_rXFSet );
-static_cast(pTab)->Reset(_rXFSet);
-static_cast(pTab)->Show();
+auto* pBitmapTab = static_cast(pTab);
+pBitmapTab->SetBitmapList(m_pBitmapList);
+pBitmapTab->SetBmpChgd(m_pnBitmapListState);
+pBitmapTab->Construct();
+pBitmapTab->ActivatePage(m_rXFSet);
+pBitmapTab->Reset(_rXFSet);
+pBitmapTab->Show();
 }
 else if(nId == PATTERN)
 {
-static_cast(pTab)->SetColorList( m_pColorList );
-static_cast(pTab)->SetPatternList( m_pPatternList 
);
-static_cast(pTab)->SetPtrnChgd( 
m_pnPatternListState );
-static_cast(pTab)->SetColorChgd( 
m_pnColorListState );
-static_cast(pTab)->Construct();
-static_cast(pTab)->ActivatePage( m_rXFSet );
-static_cast(pTab)->Reset( _rXFSet );
-static_cast(pTab)->Show();
+auto* pPatternTab = static_cast(pTab);
+pPatternTab->SetColorList(m_pColorList);
+pPatternTab->SetPatternList(m_pPatternList);
+pPatternTab->SetPtrnChgd(m_pnPatternListState);
+pPatternTab->SetColorChgd(m_pnColorListState);
+pPatternTab->Construct();
+pPatternTab->ActivatePage(m_rXFSet);
+pPatternTab->Reset(_rXFSet);
+pPatternTab->Show();
 }
 }
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index c63738672414..f70c96b0eec5 100644
--- 

[Libreoffice-commits] core.git: cui/source vcl/source

[Libreoffice Gerrit user]

 cui/source/options/personalization.cxx |   10 ++
 vcl/source/app/settings.cxx|4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 39d8e5e574c7f445c4d34a7a72d6ac40e3364ddb
Author: Muhammet Kara 
AuthorDate: Fri Oct 26 13:00:45 2018 +0300
Commit: Muhammet Kara 
CommitDate: Fri Oct 26 13:47:28 2018 +0200

Towards solving tdf#120747: Remember the preview file of persona

Change-Id: I9230421a98ea5d1ec61bf1500b24949635db68d3
Reviewed-on: https://gerrit.libreoffice.org/62387
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index d1e3b7fcef56..f199ab2082cb 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -593,8 +593,6 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 if (aPreviewFile.isEmpty())
 break;
 
-// There is no room for the preview file in the PersonaSettings 
currently
-aPersonaSetting = aPersonaSetting.replaceFirst( aPreviewFile + ";", "" 
);
 m_vDefaultPersonaSettings.push_back( aPersonaSetting );
 
 INetURLObject aURLObj( gallery + aPreviewFile );
@@ -897,6 +895,7 @@ void SearchAndParseThread::execute()
 
 OUString aPersonaSetting = personaInfo.sSlug
 + ";" + personaInfo.sName
++ ";" + personaInfo.sPreviewURL
 + ";" + personaInfo.sHeaderURL
 + ";" + personaInfo.sFooterURL
 + ";" + personaInfo.sTextColor;
@@ -959,6 +958,7 @@ void SearchAndParseThread::execute()
 
 OUString aPersonaSetting = aPersonaInfo.sSlug
 + ";" + aPersonaInfo.sName
++ ";" + aPersonaInfo.sPreviewURL
 + ";" + aPersonaInfo.sHeaderURL
 + ";" + aPersonaInfo.sFooterURL
 + ";" + aPersonaInfo.sTextColor;
@@ -1008,7 +1008,7 @@ void GetPersonaThread::execute()
 if ( !xFileAccess.is() )
 return;
 
-OUString aSlug, aName, aHeaderURL, aFooterURL, aTextColor;
+OUString aSlug, aName, aPreviewURL, aHeaderURL, aFooterURL, aTextColor;
 OUString aPersonaSetting;
 
 // get the required fields from m_aSelectedPersona
@@ -1016,6 +1016,7 @@ void GetPersonaThread::execute()
 
 aSlug = m_aSelectedPersona.getToken(0, ';', nIndex);
 aName = m_aSelectedPersona.getToken(0, ';', nIndex);
+aPreviewURL = m_aSelectedPersona.getToken(0, ';', nIndex);
 aHeaderURL = m_aSelectedPersona.getToken(0, ';', nIndex);
 aFooterURL = m_aSelectedPersona.getToken(0, ';', nIndex);
 aTextColor = m_aSelectedPersona.getToken(0, ';', nIndex);
@@ -1025,6 +1026,7 @@ void GetPersonaThread::execute()
 rtl::Bootstrap::expandMacros( gallery );
 gallery += "/user/gallery/personas/";
 
+OUString aPreviewFile( aSlug + "/" + INetURLObject( aPreviewURL 
).getName() );
 OUString aHeaderFile( aSlug + "/" + INetURLObject( aHeaderURL ).getName() 
);
 OUString aFooterFile( aSlug + "/" + INetURLObject( aFooterURL ).getName() 
);
 
@@ -1055,7 +1057,7 @@ void GetPersonaThread::execute()
 
 SolarMutexGuard aGuard;
 
-aPersonaSetting = aSlug + ";" + aName + ";" + aHeaderFile + ";" + 
aFooterFile
+aPersonaSetting = aSlug + ";" + aName + ";" + aPreviewFile + ";" + 
aHeaderFile + ";" + aFooterFile
 + ";" + aTextColor;
 
 m_pPersonaDialog->SetAppliedPersonaSetting( aPersonaSetting );
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 454c88e23a16..267a58262229 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2123,8 +2123,8 @@ static void setupPersonaHeaderFooter( WhichPersona 
eWhich, OUString& rHeaderFoot
 {
 sal_Int32 nIndex = 0;
 
-// Skip the persona slug and name
-aHeader = aPersonaSettings.getToken( 2, ';', nIndex );
+// Skip the persona slug, name, and preview
+aHeader = aPersonaSettings.getToken( 3, ';', nIndex );
 
 if ( nIndex > 0 )
 aFooter = aPersonaSettings.getToken( 0, ';', nIndex );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source vcl/source

[Xisco Fauli]

 cui/source/options/personalization.cxx |4 
 vcl/source/window/msgbox.cxx   |2 ++
 2 files changed, 6 insertions(+)

New commits:
commit 0ddd15c1134dde249552ebe763c1cd005e8b4591
Author: Xisco Fauli 
Date:   Thu Jan 4 12:41:07 2018 +0100

tdf#114818 hold the mutex before executing the error dialog

Also add an assert to ErrorBox to ensure the mutex is acquired

Change-Id: I3e426024dad6ddfc5cffc7861b0cba9e8989c018
Reviewed-on: https://gerrit.libreoffice.org/47388
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index d18d56b06fb6..c75a78c8ef2e 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -702,6 +702,7 @@ void SearchAndParseThread::execute()
 {
 // in case of a returned CommandFailedException
 // SimpleFileAccess serves it, returning an empty stream
+SolarMutexGuard aGuard;
 sError = CuiResId(RID_SVXSTR_SEARCHERROR);
 sError = sError.replaceAll("%1", m_aURL);
 m_pPersonaDialog->SetProgress( OUString() );
@@ -714,6 +715,7 @@ void SearchAndParseThread::execute()
 {
 // a catch all clause, in case the exception is not
 // served elsewhere
+SolarMutexGuard aGuard;
 sError = CuiResId(RID_SVXSTR_SEARCHERROR);
 sError = sError.replaceAll("%1", m_aURL);
 m_pPersonaDialog->SetProgress( OUString() );
@@ -754,6 +756,7 @@ void SearchAndParseThread::execute()
 {
 if( m_bDirectURL )
 {
+SolarMutexGuard aGuard;
 sError = CuiResId(RID_SVXSTR_SEARCHERROR);
 sError = sError.replaceAll("%1", m_aURL);
 m_pPersonaDialog->SetProgress( OUString() );
@@ -837,6 +840,7 @@ void SearchAndParseThread::execute()
 }
 catch ( const uno::Exception & )
 {
+SolarMutexGuard aGuard;
 sError = CuiResId( RID_SVXSTR_SEARCHERROR );
 sError = sError.replaceAll("%1", m_aURL);
 m_pPersonaDialog->SetProgress( OUString() );
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index b86335840bb7..428e4f31ef08 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -433,6 +433,7 @@ OUString WarningBox::GetStandardText()
 ErrorBox::ErrorBox( vcl::Window* pParent, const OUString& rMessage ) :
 MessBox( pParent, MessBoxStyle::Ok | MessBoxStyle::DefaultOk, 0, 
OUString(), rMessage )
 {
+DBG_TESTSOLARMUTEX();
 // Default Text is the display title from the application
 if ( GetText().isEmpty() )
 SetText( GetStandardText() );
@@ -450,6 +451,7 @@ ErrorBox::ErrorBox( vcl::Window* pParent, MessBoxStyle 
nStyle, WinBits nWinBits,
 const OUString& rMessage ) :
 MessBox( pParent, nStyle, nWinBits, OUString(), rMessage )
 {
+DBG_TESTSOLARMUTEX();
 // Default Text is the display title from the application
 if ( GetText().isEmpty() )
 SetText( GetStandardText() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source vcl/source

[Katarina Behrens]

 cui/source/options/optgdlg.cxx   |4 
 vcl/source/app/IconThemeInfo.cxx |6 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 7e7b9652f44f01fbaf5bc3fde454ba41ce0fe0f7
Author: Katarina Behrens 
Date:   Wed Sep 20 13:12:27 2017 +0200

Different take on tdf#108406: exclude helpimg from installed themes

as it still might get selected as default theme under some circumstances
and removing it from list in optgdlg.cxx leads to crash

This reverts commit 60adba3fb904ed66251ff39c82fe20bec151ef0b but
allegedly still crashes on Debian

Change-Id: Ib853cc27058d8635482f19a8db26075d64103e1b
Reviewed-on: https://gerrit.libreoffice.org/42545
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b27de607befe..95dcafddabc9 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -633,10 +633,6 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 StyleSettings aStyleSettings = 
Application::GetSettings().GetStyleSettings();
 mInstalledIconThemes = aStyleSettings.GetInstalledIconThemes();
 
-//Removing "Helpimg" from the list, as it is not a real iconset (see 
tdf#108406)
-mInstalledIconThemes.erase(std::remove_if(mInstalledIconThemes.begin(), 
mInstalledIconThemes.end(),
-[](vcl::IconThemeInfo theme) { return 
theme.GetDisplayName() == "Helpimg";}), mInstalledIconThemes.end());
-
 // Start with the automatically chosen icon theme
 OUString autoThemeId = aStyleSettings.GetAutomaticallyChosenIconTheme();
 const vcl::IconThemeInfo& autoIconTheme = 
vcl::IconThemeInfo::FindIconThemeById(mInstalledIconThemes, autoThemeId);
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index b3f6d9a40a33..0a6b4f159b03 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -28,6 +28,8 @@ static const OUStringLiteral BREEZE_DARK_DISPLAY_NAME("Breeze 
Dark");
 static const OUStringLiteral SIFR_DARK_ID("sifr_dark");
 static const OUStringLiteral SIFR_DARK_DISPLAY_NAME("Sifr Dark");
 
+static const OUStringLiteral HELPIMG_FAKE_THEME("helpimg");
+
 OUString
 filename_from_url(const OUString& url)
 {
@@ -94,6 +96,10 @@ IconThemeInfo::UrlCanBeParsed(const OUString& url)
 return false;
 }
 
+if (fname.indexOf(HELPIMG_FAKE_THEME) != -1 ) {
+return false;
+}
+
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source vcl/source

[Jochen Nitschke]

 cui/source/dialogs/screenshotannotationdlg.cxx |5 ++---
 vcl/source/window/layout.cxx   |9 +++--
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 0140d931e17a6392ead39a0250b2266fb6dfddf4
Author: Jochen Nitschke 
Date:   Sun Aug 28 11:45:28 2016 +0200

loplugin:defaultparams

Change-Id: I9e6b81855e421186af92e53c71f5ba9bd8005319
Reviewed-on: https://gerrit.libreoffice.org/28433
Reviewed-by: Jochen Nitschke 
Tested-by: Jochen Nitschke 

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index e2a9b4c..6016cd0 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -206,7 +206,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
 if (mpText)
 {
 mpText->SetText("The quick brown fox jumps over the lazy dog :)");
-mpText->SetReadOnly(true);
+mpText->SetReadOnly();
 }
 
 // set click handler for save button
@@ -406,8 +406,7 @@ void ScreenshotAnnotationDlg_Impl::PaintControlDataEntry(
 // no transparency, draw without
 mpVirtualBufferDevice->DrawPolyLine(
 aPolygon,
-fLineWidth,
-basegfx::B2DLineJoin::Round);
+fLineWidth);
 }
 }
 }
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index bc548ec..56a2ac3 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -230,8 +230,7 @@ void VclContainer::Command(const CommandEvent& rCEvt)
 
 aMenu->InsertItem(
 nLocalID,
-pChild->GetText(),
-MenuItemBits::NONE);
+pChild->GetText());
 aMenu->SetHelpText(
 nLocalID,
 pChild->GetHelpText());
@@ -254,8 +253,7 @@ void VclContainer::Command(const CommandEvent& rCEvt)
 
 aMenu->InsertItem(
 nLocalID,
-"Screenshot",
-MenuItemBits::NONE);
+"Screenshot");
 aMenu->SetHelpText(
 nLocalID,
 "Go into interactive screenshot annotation mode");
@@ -263,8 +261,7 @@ void VclContainer::Command(const CommandEvent& rCEvt)
 nLocalID,
 "InteractiveScreenshotMode");
 aMenu->EnableItem(
-nLocalID,
-true);
+nLocalID);
 nScreenshotButtonID = nLocalID;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source vcl/source

[Yousuf Philips]

 cui/source/dialogs/about.cxx |1 -
 vcl/source/app/svapp.cxx |6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 52856b6ea7b6b01e8a8455ed657dc16b79de6790
Author: Yousuf Philips 
Date:   Fri Dec 11 15:21:39 2015 +0400

Update hardware/OS info in About dialog

Change-Id: I2c70e88cfa2663d0b3db48c309d7cf1630bbddbd
Reviewed-on: https://gerrit.libreoffice.org/20632
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 07615cd..ab23cf8 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -296,7 +296,6 @@ OUString AboutDialog::GetVersionString()
 
 sVersion += "\n";
 sVersion += Application::GetHWOSConfInfo();
-sVersion += "\n";
 
 if (EXTRA_BUILDID[0] != '\0')
 {
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 1d2e09c..d26a350 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1197,7 +1197,7 @@ OUString Application::GetHWOSConfInfo()
 ImplSVData* pSVData = ImplGetSVData();
 OUStringBuffer aDetails;
 
-aDetails.append( "Threads " );
+aDetails.append( "CPU Threads: " );
 aDetails.append( (sal_Int32)
 std::thread::hardware_concurrency() );
 aDetails.append( "; " );
@@ -1208,11 +1208,11 @@ OUString Application::GetHWOSConfInfo()
 else
 aVersion = "-";
 
-aDetails.append( "Ver: " );
+aDetails.append( "OS Version: " );
 aDetails.append( aVersion );
 aDetails.append( "; " );
 
-aDetails.append( "Render: " );
+aDetails.append( "UI Render: " );
 if ( OpenGLWrapper::isVCLOpenGLEnabled() )
 aDetails.append( "GL" );
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source vcl/source

[Markus Mohrhard]

 cui/source/options/optgdlg.cxx |2 +-
 vcl/source/opengl/OpenGLHelper.cxx |   19 +--
 2 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit ae177f5b9965684c1a358aa43e5957cff218210b
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu Dec 18 10:13:40 2014 +0100

ifix the OpenGL UI config part

Change-Id: I931a4b618f35188e4e0cca07305ff15bbbacc20a

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 55222bc9..28e0677 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -146,7 +146,7 @@ OpenGLCfg::~OpenGLCfg()
 boost::shared_ptr comphelper::ConfigurationChanges  batch( 
comphelper::ConfigurationChanges::create() );
 officecfg::Office::Common::VCL::UseOpenGL::set(mbUseOpenGL, batch);
 officecfg::Office::Common::VCL::ForceOpenGL::set(mbForceOpenGL, batch);
-
+batch-commit();
 }
 }
 
diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index 7f4cf36..a30b9ef 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -401,6 +401,17 @@ bool OpenGLHelper::supportsVCLOpenGL()
 
 bool OpenGLHelper::isVCLOpenGLEnabled()
 {
+/**
+ * The !bSet part should only be called once! Changing the results in the 
same
+ * run will mix OpenGL and normal rendering.
+ */
+static bool bSet = false;
+static bool bEnable = false;
+static bool bForceOpenGL = false;
+if (bSet)
+{
+return bForceOpenGL || bEnable;
+}
 /*
  * There are a number of cases that these environment variables cover:
  *  * SAL_FORCEGL forces OpenGL independent of any other option
@@ -408,16 +419,20 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
  *  * SAL_ENABLEGL overrides VCL_HIDE_WINDOWS and the configuration 
variable
  *  * the configuration variable is checked if no environment variable is 
set
  */
-static bool bForceOpenGL = !!getenv(SAL_FORCEGL) || 
officecfg::Office::Common::VCL::ForceOpenGL::get();
+
+bSet = true;
+bForceOpenGL = !!getenv(SAL_FORCEGL) || 
officecfg::Office::Common::VCL::ForceOpenGL::get();
 if (bForceOpenGL)
 return true;
 
 if (!supportsVCLOpenGL())
+{
 return false;
+}
 
 static bool bEnableGLEnv = !!getenv(SAL_ENABLEGL);
 
-bool bEnable = bEnableGLEnv;
+bEnable = bEnableGLEnv;
 
 static bool bDuringBuild = getenv(VCL_HIDE_WINDOWS);
 if (bDuringBuild  !bEnable /* env. enable overrides */)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits