summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2021-06-13 15:06:08 +0200
committerJulien Nabet <serval2412@yahoo.fr>2021-06-14 21:42:16 +0200
commitbc63b8a94d95cf86da142bfd4f8d0a6b3ba3d83f (patch)
treee0e87c1ee768ef5e3d15b1fa96b23f946cb522f6 /sd/source/ui/inc
parent1e01325b95db73ffb8d773573a89e1ba9e5deb18 (diff)
Fix Exception from PutProperties in unotools
Launch Impress, click on "Animation" icon and check/uncheck "Automatic Preview" checkbox (at bottom right) Close Impress and notice this twice: warn:unotools.config:9155:9155:unotools/source/config/configitem.cxx:487: Exception from PutProperties com.sun.star.lang.IllegalArgumentException message: configmgr inappropriate property value /home/julien/lo/libreoffice/configmgr/source/access.cxx:1497 ArgumentPosition: -1 Investigating a bit, I noticed: officecfg/registry/schema/org/openoffice/Office/Impress.xcs 673 <prop oor:name="Width" oor:type="xs:int" oor:nillable="false"> 680 <prop oor:name="Height" oor:type="xs:int" oor:nillable="false"> officecfg/registry/schema/org/openoffice/Office/Draw.xcs 429 <prop oor:name="Width" oor:type="xs:int" oor:nillable="false"> 436 <prop oor:name="Height" oor:type="xs:int" oor:nillable="false"> sd/source/ui/app/optsitem.cxx:479: "DefaultObjectSize/Width", sd/source/ui/app/optsitem.cxx:480: "DefaultObjectSize/Height", Change-Id: I608b882cdff03e464fdb9886d5ba28dd33bfe229 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117095 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sd/source/ui/inc')
-rw-r--r--sd/source/ui/inc/optsitem.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 011e45ba2142..979b90b78425 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -182,8 +182,8 @@ class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric
{
private:
- sal_uLong nDefaultObjectSizeWidth;
- sal_uLong nDefaultObjectSizeHeight;
+ sal_Int32 nDefaultObjectSizeWidth;
+ sal_Int32 nDefaultObjectSizeHeight;
bool bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot
bool bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable
@@ -259,8 +259,8 @@ public:
sal_uInt16 GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; };
bool IsShowUndoDeleteWarning() const { Init(); return bShowUndoDeleteWarning; }
bool IsSlideshowRespectZOrder() const { Init(); return bSlideshowRespectZOrder; }
- sal_uLong GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; }
- sal_uLong GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; }
+ sal_Int32 GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; }
+ sal_Int32 GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; }
bool IsPreviewNewEffects() const { Init(); return bPreviewNewEffects; }
bool IsPreviewChangedEffects() const { Init(); return bPreviewChangedEffects; }
@@ -299,8 +299,8 @@ public:
void SetSolidDragging( bool bOn ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } }
void SetShowUndoDeleteWarning( bool bOn ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } }
void SetSlideshowRespectZOrder( bool bOn ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } }
- void SetDefaultObjectSizeWidth( sal_uLong nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } }
- void SetDefaultObjectSizeHeight( sal_uLong nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } }
+ void SetDefaultObjectSizeWidth( sal_Int32 nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } }
+ void SetDefaultObjectSizeHeight( sal_Int32 nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } }
void SetPreviewNewEffects( bool bOn ) { if( bPreviewNewEffects != bOn ) { OptionsChanged(); bPreviewNewEffects = bOn; } }
void SetPreviewChangedEffects( bool bOn ) { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } }