core.git: include/svtools sc/source sd/source svtools/source svx/source sw/source
include/svtools/accessibilityoptions.hxx |5 -
sc/source/ui/view/output.cxx |4 ++--
sd/source/ui/annotations/annotationwindow.cxx |3 ++-
sd/source/ui/view/outlview.cxx |3 ++-
svtools/source/config/accessibilityoptions.cxx | 16
svx/source/sdr/contact/objectcontactofpageview.cxx |5 +++--
svx/source/svdraw/svdedxv.cxx |5 +++--
sw/source/core/view/viewsh.cxx |7 +++
sw/source/uibase/config/viewopt.cxx|3 +--
9 files changed, 16 insertions(+), 35 deletions(-)
New commits:
commit ba12e22f28150ec00d55e4fb99838710a3973e57
Author: Gabor Kelemen
AuthorDate: Wed Dec 13 01:18:40 2023 +0100
Commit: Gabor Kelemen
CommitDate: Sun Dec 24 12:14:58 2023 +0100
Drop some wrapper methods from SvtAccessibilityOptions
just use the wrapped officecfg methods instead of:
GetIsAllowAnimatedGraphics
GetIsAllowAnimatedText
GetIsAutomaticFontColor
IsSelectionInReadonly
Change-Id: I74de75fc9ff2f9a36ef376255e937bb373055587
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161236
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/include/svtools/accessibilityoptions.hxx
b/include/svtools/accessibilityoptions.hxx
index cb4596228bee..6cebf4e005c9 100644
--- a/include/svtools/accessibilityoptions.hxx
+++ b/include/svtools/accessibilityoptions.hxx
@@ -35,11 +35,6 @@ public:
virtual ~SvtAccessibilityOptions() override;
// get & set config entries
-static bool GetIsAllowAnimatedGraphics();
-static bool GetIsAllowAnimatedText();
-static bool GetIsAutomaticFontColor();
-static bool IsSelectionInReadonly();
-
static void SetVCLSettings();
};
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 7eeec493219c..be482d70d03e 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -26,11 +26,11 @@
#include
#include
#include
-#include
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -170,7 +170,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev,
ScOutputType eNewType,
bPagebreakMode( false ),
bSolidBackground( false ),
mbUseStyleColor( false ),
-mbForceAutoColor( SvtAccessibilityOptions::GetIsAutomaticFontColor() ),
+mbForceAutoColor(
officecfg::Office::Common::Accessibility::IsAutomaticFontColor::get() ),
mbSyntaxMode( false ),
aGridColor( COL_BLACK ),
mbShowNullValues( true ),
diff --git a/sd/source/ui/annotations/annotationwindow.cxx
b/sd/source/ui/annotations/annotationwindow.cxx
index 02495794aefa..99a58a085376 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
@@ -551,7 +552,7 @@ void AnnotationWindow::SetColor()
maColorLight = AnnotationManagerImpl::GetColorLight( nAuthorIdx );
}
-mpOutliner->ForceAutoColor( bHighContrast ||
SvtAccessibilityOptions::GetIsAutomaticFontColor() );
+mpOutliner->ForceAutoColor( bHighContrast ||
officecfg::Office::Common::Accessibility::IsAutomaticFontColor::get() );
mxPopover->set_background(maColor);
mxMenuButton->set_background(maColor);
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index d424f0117c27..087aa50ee86e 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
@@ -154,7 +155,7 @@ OutlineView::~OutlineView()
EEControlBits nCntrl = mrOutliner.GetControlWord();
mrOutliner.SetUpdateLayout(false); // otherwise there will be drawn on
SetControlWord
mrOutliner.SetControlWord(nCntrl & ~EEControlBits::NOCOLORS);
-mrOutliner.ForceAutoColor(
SvtAccessibilityOptions::GetIsAutomaticFontColor() );
+mrOutliner.ForceAutoColor(
officecfg::Office::Common::Accessibility::IsAutomaticFontColor::get() );
mrOutliner.Clear();
}
}
diff --git a/svtools/source/config/accessibilityoptions.cxx
b/svtools/source/config/accessibilityoptions.cxx
index 460354cae319..877b0653335d 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -194,22 +194,6 @@ SvtAccessibilityOptions::~SvtAccessibilityOptions()
sm_pSingleImplConfig = nullptr;
}
}
-bool SvtAccessibilityOptions::GetIsAllowAnimatedGraphics()
-{
-return
officecfg::Office::Common::Accessibility::IsAllowAnimatedGraphics::get();
-}
-bool SvtAccessibilityOptions::GetIsAllowAnimatedText()
-{
-return
officecfg::Office::Common::Accessibility::IsAllowAnimatedText::get();
-}
-bool SvtAccessibilityOptions::GetIsAutomaticFontColor()
-{
-return
core.git: include/svtools sc/source sd/source svtools/source svx/source sw/source
include/svtools/optionsdrawinglayer.hxx | 18 ---
sc/source/ui/view/drawvie3.cxx|7 ++--
sd/source/ui/view/sdview.cxx |6 +--
svtools/source/config/optionsdrawinglayer.cxx | 41 --
svx/source/svdraw/svdpntv.cxx |6 +--
sw/source/core/draw/dview.cxx |6 ++-
6 files changed, 14 insertions(+), 70 deletions(-)
New commits:
commit fd527ecbac39c6e15cc27da30bd05cb2ff85fd82
Author: Gabor Kelemen
AuthorDate: Thu Nov 2 11:40:07 2023 +0100
Commit: Thorsten Behrens
CommitDate: Wed Dec 13 07:29:47 2023 +0100
Drop some wrapper methods from SvtOptionsDrawinglayer
just use the wrapped officecfg methods instead of:
IsOverlayBuffer
IsPaintBuffer
IsOverlayBuffer_Calc
IsOverlayBuffer_Writer
IsOverlayBuffer_DrawImpress
IsPaintBuffer_Calc
IsPaintBuffer_Writer
IsPaintBuffer_DrawImpress
Change-Id: I2bd340b8c9c711c33c19fb1d764ce20bade0476e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160651
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/include/svtools/optionsdrawinglayer.hxx
b/include/svtools/optionsdrawinglayer.hxx
index 5d6316aa30e6..8a0948d9da1b 100644
--- a/include/svtools/optionsdrawinglayer.hxx
+++ b/include/svtools/optionsdrawinglayer.hxx
@@ -30,12 +30,6 @@ namespace SvtOptionsDrawinglayer
@short interface methods to get and set value of config key
"org.openoffice.Office.Common/Drawinglayer/..."
@descr These options describe internal states to enable/disable
features of installed office.
-IsOverlayBuffer()
-SetOverlayBuffer() => Activate this field for letting
Overlay use a buffer
-
-IsPaintBuffer()
-SetPaintBuffer()=> Activate this field for letting
Paint use a prerender buffer
-
GetStripeColorA()
SetStripeColorA() => Set first of two colors which
overlay uses to draw stripes
@@ -48,22 +42,10 @@ namespace SvtOptionsDrawinglayer
@seealsoconfiguration package
"org.openoffice.Office.Common/Drawinglayer"
*//*-*/
-SVT_DLLPUBLIC boolIsOverlayBuffer();
-SVT_DLLPUBLIC boolIsPaintBuffer();
SVT_DLLPUBLIC Color GetStripeColorA();
SVT_DLLPUBLIC Color GetStripeColorB();
SVT_DLLPUBLIC sal_uInt16 GetStripeLength();
-// #i73602#
-SVT_DLLPUBLIC boolIsOverlayBuffer_Calc();
-SVT_DLLPUBLIC boolIsOverlayBuffer_Writer();
-SVT_DLLPUBLIC boolIsOverlayBuffer_DrawImpress();
-
-// #i74769#, #i75172#
-SVT_DLLPUBLIC boolIsPaintBuffer_Calc();
-SVT_DLLPUBLIC boolIsPaintBuffer_Writer();
-SVT_DLLPUBLIC boolIsPaintBuffer_DrawImpress();
-
// #i4219#
SVT_DLLPUBLIC sal_uInt32 GetMaximumPaperWidth();
SVT_DLLPUBLIC sal_uInt32 GetMaximumPaperHeight();
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 6561423ab2a5..5581a69e7961 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -26,7 +26,8 @@
#include
#include
#include
-#include
+#include
+#include
#include
#include
@@ -52,10 +53,10 @@ ScDrawView::ScDrawView(
{
SetNegativeX(comphelper::LibreOfficeKit::isActive() &&
rDoc.IsLayoutRTL(nTab));
// #i73602# Use default from the configuration
-SetBufferedOverlayAllowed(SvtOptionsDrawinglayer::IsOverlayBuffer_Calc());
+SetBufferedOverlayAllowed(!utl::ConfigManager::IsFuzzing() &&
officecfg::Office::Common::Drawinglayer::OverlayBuffer_Calc::get());
// #i74769#, #i75172# Use default from the configuration
-SetBufferedOutputAllowed(SvtOptionsDrawinglayer::IsPaintBuffer_Calc());
+SetBufferedOutputAllowed(!utl::ConfigManager::IsFuzzing() &&
officecfg::Office::Common::Drawinglayer::PaintBuffer_Calc::get());
Construct();
}
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index dd4ddaab1fcf..9533a4be5c51 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
@@ -85,7 +86,6 @@
#include
#include
#include
-#include
#include
#include
@@ -114,10 +114,10 @@ View::View(
mpClipboard (new ViewClipboard (*this))
{
// #i73602# Use default from the configuration
-
SetBufferedOverlayAllowed(SvtOptionsDrawinglayer::IsOverlayBuffer_DrawImpress());
+SetBufferedOverlayAllowed(!utl::ConfigManager::IsFuzzing() &&
officecfg::Office::Common::Drawinglayer::OverlayBuffer_DrawImpress::get());
// #i74769#, #i75172# Use default from the configuration
-
SetBufferedOutputAllowed(SvtOptionsDrawinglayer::IsPaintBuffer_DrawImpress());
+SetBufferedOutputAllowed(!utl::ConfigManager::IsFuzzing() &&
[Libreoffice-commits] core.git: include/svtools sc/source sd/source svtools/source svx/source sw/source
include/svtools/miscopt.hxx |4 --
sc/source/ui/drawfunc/fuins1.cxx |4 +-
sd/source/ui/func/fuinsert.cxx|4 +-
svtools/source/config/miscopt.cxx | 63 ++
svx/source/dialog/linkwarn.cxx| 18 ++
sw/source/uibase/uiview/view2.cxx |4 +-
6 files changed, 21 insertions(+), 76 deletions(-)
New commits:
commit d3a9db6310204247a3bd8f23a984c5a04afbeef1
Author: Noel Grandin
AuthorDate: Sat Oct 31 18:55:36 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Nov 1 21:05:00 2020 +0100
use officecfg for ShowLinkWarningDialog
Change-Id: I92a42eb2ff48bff4e635f1a37a25c8ecb9ac1347
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105153
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx
index 90e3702a2838..f2902de1a4a3 100644
--- a/include/svtools/miscopt.hxx
+++ b/include/svtools/miscopt.hxx
@@ -73,10 +73,6 @@ class SVT_DLLPUBLIC SvtMiscOptions final : public
utl::detail::Options
sal_Int16 GetToolboxStyle() const;
voidSetToolboxStyle( sal_Int16 nStyle );
-boolShowLinkWarningDialog() const;
-voidSetShowLinkWarningDialog( bool bSet );
-boolIsShowLinkWarningDialogReadOnly() const;
-
voidSetMacroRecorderMode( bool bSet );
boolIsMacroRecorderMode() const;
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 4187300e3428..d5a28f8a29ad 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -19,6 +19,7 @@
#include
+#include
#include
#include
#include
@@ -30,7 +31,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -325,7 +325,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell& rViewSh,
bool bAsLink = aDlg.IsAsLink();
// really store as link only?
-if( bAsLink && SvtMiscOptions().ShowLinkWarningDialog() )
+if( bAsLink &&
officecfg::Office::Common::Misc::ShowLinkWarningDialog::get() )
{
SvxLinkWarningDialog aWarnDlg(pWin ? pWin->GetFrameWeld()
: nullptr, aFileName);
if (aWarnDlg.run() != RET_OK)
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index ce0d45082b3f..cc93f6f38c37 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -37,7 +38,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -177,7 +177,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq )
if(pGrafObj && bAsLink )
{
// really store as link only?
-if( SvtMiscOptions().ShowLinkWarningDialog() )
+if(
officecfg::Office::Common::Misc::ShowLinkWarningDialog::get() )
{
SvxLinkWarningDialog aWarnDlg(mpWindow->GetFrameWeld(),
aFileName);
if (aWarnDlg.run() != RET_OK)
diff --git a/svtools/source/config/miscopt.cxx
b/svtools/source/config/miscopt.cxx
index fe216fe263e0..3390cba46229 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -50,16 +50,14 @@ using namespace ::com::sun::star;
#define PROPERTYHANDLE_TOOLBOXSTYLE 1
#define PROPERTYNAME_ICONTHEME "SymbolStyle"
#define PROPERTYHANDLE_SYMBOLSTYLE 2
-#define PROPERTYNAME_SHOWLINKWARNINGDIALOG "ShowLinkWarningDialog"
-#define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG3
#define PROPERTYNAME_DISABLEUICUSTOMIZATION "DisableUICustomization"
-#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 4
+#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 3
#define PROPERTYNAME_MACRORECORDERMODE "MacroRecorderMode"
-#define PROPERTYHANDLE_MACRORECORDERMODE5
+#define PROPERTYHANDLE_MACRORECORDERMODE4
#define PROPERTYNAME_SIDEBARICONSIZE"SidebarIconSize"
-#define PROPERTYHANDLE_SIDEBARICONSIZE 6
+#define PROPERTYHANDLE_SIDEBARICONSIZE 5
#define PROPERTYNAME_NOTEBOOKBARICONSIZE"NotebookbarIconSize"
-#define PROPERTYHANDLE_NOTEBOOKBARICONSIZE 7
+#define PROPERTYHANDLE_NOTEBOOKBARICONSIZE 6
class SvtMiscOptions_Impl : public ConfigItem
{
@@ -74,8 +72,6 @@ private:
boolm_bIsSymbolsStyleRO;
sal_Int16 m_nToolboxStyle;
boolm_bIsToolboxStyleRO;
-boolm_bShowLinkWarningDialog;
-boolm_bIsShowLinkWarningDialogRO;
boolm_bDisableUICustomization;
boolm_bMacroRecorderMode;
boolm_bIconThemeWasSetAutomatically;
@@ -161,15 +157,6 @@ public:
// translate from VCL settings
void SetToolboxStyle( sal_Int16 nStyle );
-bool ShowLinkWarningDialog()
