diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-09 11:50:43 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-09 13:37:00 +0100 |
commit | bf912d1a184bf50e326f428b7d0c083526f2783b (patch) | |
tree | 89460bd5694e029e4a7481f64ff48812b3e33ad2 /desktop/source/deployment/inc | |
parent | 57091022781ac3d0509e417bf427d2edc723eed2 (diff) |
dp_dependencies clean up
Diffstat (limited to 'desktop/source/deployment/inc')
-rw-r--r-- | desktop/source/deployment/inc/dp_dependencies.hxx | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx index 246d176bc4ec..5cd310858431 100644 --- a/desktop/source/deployment/inc/dp_dependencies.hxx +++ b/desktop/source/deployment/inc/dp_dependencies.hxx @@ -29,8 +29,8 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DEPENDENCIES_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DEPENDENCIES_HXX -#include "unotools/configmgr.hxx" #include "sal/config.h" + #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/Sequence.hxx" #include "dp_misc_api.hxx" @@ -45,14 +45,6 @@ namespace rtl { class OUString; } namespace dp_misc { -struct BrandName : public ::rtl::StaticWithInit< ::rtl::OUString, BrandName > { - const ::rtl::OUString operator () () { - return ::utl::ConfigManager::GetDirectConfigProperty( - ::utl::ConfigManager::PRODUCTNAME ).get< ::rtl::OUString >(); - } -}; - - /** Dependency handling. */ @@ -67,10 +59,9 @@ namespace Dependencies { a list of the unsatisfied dependencies from <code>infoset</code> (in no specific order) */ - DESKTOP_DEPLOYMENTMISC_DLLPUBLIC - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XElement > > - check(::dp_misc::DescriptionInfoset const & infoset); + DESKTOP_DEPLOYMENTMISC_DLLPUBLIC com::sun::star::uno::Sequence< + com::sun::star::uno::Reference< com::sun::star::xml::dom::XElement > > + check(dp_misc::DescriptionInfoset const & infoset); /** Obtain the (human-readable) error message of a failed dependency. @@ -81,10 +72,10 @@ namespace Dependencies { @return the name of the dependency; will never be empty, as a localized “unknown” is substituted for an empty/missing name - */ - DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString getErrorText( - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XElement > const & dependency); + */ + DESKTOP_DEPLOYMENTMISC_DLLPUBLIC rtl::OUString getErrorText( + com::sun::star::uno::Reference< com::sun::star::xml::dom::XElement > + const & dependency); } } |