diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-07-18 14:00:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-07-18 14:10:55 +0200 |
| commit | aebf5bf22304c73e121b16dc0b51f909c5f34c28 (patch) | |
| tree | 4702bb5a0687bf1f913a3b691872f9d7a92122a9 /cui/source/inc | |
| parent | ea9689723754628718507a23d1f6d3a26bac32e0 (diff) | |
fdo#52232 ConfigurationSet wrapper unusable for localized properties
The comphelper::ConfigurationSet wrapper, used by the automatically generated
headers to access the configuration data from C++, is based on
com.sun.star.configuration.ReadOnlyAccess/ReadWriteAcess that provide an all-
locales view of the configuration data, i.e., a localized property is represented as a UNO object implementing various container interfaces (to access the per-locale values) instead of a plain value.
Hence,
xLeaveAccess->getByName(C2U("Label")) >>= sLeafLabel;
silently changed its meaning, now silently failing to extract a string and
leaving sLeafLabel empty, which in turn causes the labels of extension option
pages to disappear from the "Tools - Options..." dialog.
This partially reverts commit 161c3f179f71eda2a32dabaf68ff6fb3ba487062 "Some
more comphelper/configurationhelper clean up."
Change-Id: I584c682ea6a7c8b9444b34f1867cc553ad160802
Diffstat (limited to 'cui/source/inc')
| -rw-r--r-- | cui/source/inc/treeopt.hxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 38700e684d24..64d2b9b38a55 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -138,6 +138,7 @@ struct LastPageSaver // class OfaTreeOptionsDialog -------------------------------------------- namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } } +namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } } namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } namespace com { namespace sun { namespace star { namespace awt { class XContainerWindowProvider; } } } } @@ -191,8 +192,12 @@ private: com::sun::star::lang::XMultiServiceFactory >& xMFac, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame ); - Module* LoadModule( const rtl::OUString& rModuleIdentifier ); - void LoadNodes( Module* pModule, + Module* LoadModule( const rtl::OUString& rModuleIdentifier, + const com::sun::star::uno::Reference< + com::sun::star::container::XNameAccess >& xRoot ); + void LoadNodes( const com::sun::star::uno::Reference< + com::sun::star::container::XNameAccess >& xRoot, + Module* pModule, const rtl::OUString& rExtensionId, VectorOfNodes& rOutNodeList ); void InsertNodes( const VectorOfNodes& rNodeList ); |