summaryrefslogtreecommitdiff
path: root/unotools/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-10-05 15:00:39 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-10-05 15:19:05 +0200
commit9db74c6133ede2a28af077fd563398176ff0d858 (patch)
tree06161435d835a269c1ed17e590ba73b3653075c6 /unotools/inc
parentaed09ee69fb2e5edfb02c4df81ef1adee407c54f (diff)
fdo#46071: Do not hide windows based on nil "Visible" property
This appears to be messy: The /org.openoffice.Office.Views/WindowType configuration group template has both a nilable bool "Visible" property and a UserData/Data string property that encodes various things like geometry---but also visibility---in a string. Now, likely due to the problem that has meanwhile been fixed through f3f79cc9e6c265baf48955d53f7e888205e0b3e0 "Resolves fdo#46074: Fix Partial::contains for paths that go past a leaf node," some registrymodification.xcu files in the wild contain such WindowType entries in "default" state, without a UserData/Data string and with a nil "Visible" property. The way SfxChildWindow::InitializeChildWinFactory_Impl and SvtViewOptions::IsVisible are implemented, they will always lead to an invisible window for such broken registrymodification.xcu data (as IsVisible unhelpfully returns false for a nil value, and InitializeChildWinFactory_Impl uses that value when there is no UserData/Data string). For the Math formula editor window (ID 30378) this means that it can disappear from the UI completely, as there appears to be no UI trigger for the user to show it in case it is hidden. The fix is to introdue SvtViewOptions::HasVisible (which only returns true if the property is not nil) and change InitializeChidlWinFactory_Impl to only use the value of IsVisible() if HasVisible() returns true. This makes the code even more baroque, but this is a rather central, generic piece of code for all sorts of windows, so I do not want to break any other uses by e.g. changing IsVisible to return true for a nil property. Change-Id: Iae40075a7116a8aabd2d25aa9334709522e23d8f
Diffstat (limited to 'unotools/inc')
-rw-r--r--unotools/inc/unotools/viewoptions.hxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/unotools/inc/unotools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx
index 2dbfdd485a38..8270ed9ef933 100644
--- a/unotools/inc/unotools/viewoptions.hxx
+++ b/unotools/inc/unotools/viewoptions.hxx
@@ -225,6 +225,13 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options
sal_Bool IsVisible ( ) const;
void SetVisible( sal_Bool bState );
+ /** Return true if the "Visible" property actually has a non-nil value
+
+ (IsVisible will somewhat arbitrarily return false if the property is
+ nil.)
+ */
+ bool HasVisible() const;
+
/*-****************************************************************************************************//**
@short use it to set/get the extended user data (consisting of a set of named scalar values)
@descr It's supported for ALL types!