diff options
20 files changed, 3 insertions, 968 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 977080c73a..c601727192 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -127,10 +127,7 @@ class Desktop : public Application static sal_Bool CheckOEM(); static sal_Bool isCrashReporterEnabled(); - // first-start (ever) & license relate methods - static rtl::OUString GetLicensePath(); - static sal_Bool LicenseNeedsAcceptance(); - static sal_Bool IsFirstStartWizardNeeded(); + // first-start (ever) related methods static sal_Bool CheckExtensionDependencies(); static void DoRestartActionsIfNecessary( sal_Bool bQuickStart ); diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx index dc6c9600ea..4ab37b7a3e 100644 --- a/desktop/source/app/appfirststart.cxx +++ b/desktop/source/app/appfirststart.cxx @@ -49,88 +49,6 @@ using namespace ::com::sun::star::beans; static const OUString sConfigSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ) ); static const OUString sAccessSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) ); -/* Path of the license. */ -OUString Desktop::GetLicensePath() -{ - // license file name - static const char *szLicensePath = "/share/readme"; -#if defined(WNT) || defined(OS2) - static const char *szWNTLicenseName = "/license"; - static const char *szWNTLicenseExt = ".txt"; -#else - static const char *szUNXLicenseName = "/LICENSE"; - static const char *szUNXLicenseExt = ""; -#endif - static OUString aLicensePath; - - if (aLicensePath.getLength() > 0) - return aLicensePath; - - OUString aBaseInstallPath(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR")); - rtl::Bootstrap::expandMacros(aBaseInstallPath); - - // determine the filename of the license to show - OUString aLangString; - ::com::sun::star::lang::Locale aLocale; - rtl::OString aMgrName = rtl::OString("dkt"); - - AllSettings aSettings(Application::GetSettings()); - aLocale = aSettings.GetUILocale(); - ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale); - - aLangString = aLocale.Language; - if ( aLocale.Country.getLength() != 0 ) - { - aLangString += OUString(RTL_CONSTASCII_USTRINGPARAM("-")); - aLangString += aLocale.Country; - if ( aLocale.Variant.getLength() != 0 ) - { - aLangString += OUString(RTL_CONSTASCII_USTRINGPARAM("-")); - aLangString += aLocale.Variant; - } - } -#if defined(WNT) || defined(OS2) - aLicensePath = - aBaseInstallPath + OUString::createFromAscii(szLicensePath) - + OUString::createFromAscii(szWNTLicenseName) - + OUString(RTL_CONSTASCII_USTRINGPARAM("_")) - + aLangString - + OUString::createFromAscii(szWNTLicenseExt); -#else - aLicensePath = - aBaseInstallPath + OUString::createFromAscii(szLicensePath) - + OUString::createFromAscii(szUNXLicenseName) - + OUString(RTL_CONSTASCII_USTRINGPARAM("_")) - + aLangString - + OUString::createFromAscii(szUNXLicenseExt); -#endif - delete pLocalResMgr; - return aLicensePath; -} - -/* Check if we need to accept license. */ -sal_Bool Desktop::LicenseNeedsAcceptance() -{ - // Don't show a license - return sal_False; -/* - sal_Bool bShowLicense = sal_True; - sal_Int32 nOpenSourceContext = 0; - try - { - ::utl::ConfigManager::GetDirectConfigProperty( - ::utl::ConfigManager::OPENSOURCECONTEXT ) >>= nOpenSourceContext; - } - catch( const ::com::sun::star::uno::Exception& ) {} - - // open source needs no license - if ( nOpenSourceContext > 0 ) - bShowLicense = sal_False; - - return bShowLicense; -*/ -} - /* Local function - get access to the configuration */ static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rPath ) { @@ -147,128 +65,6 @@ static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rP xConfigProvider->createInstanceWithArguments( sAccessSrvc, aArgs ), UNO_QUERY_THROW ); } -/* Local function - was the wizard completed already? */ -static sal_Bool impl_isFirstStart() -{ - try { - Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) ); - - Any result = xPSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("FirstStartWizardCompleted"))); - sal_Bool bCompleted = sal_False; - if ((result >>= bCompleted) && bCompleted) - return sal_False; // wizard was already completed - else - return sal_True; - } catch (const Exception&) - { - return sal_True; - } -} - -/* Local function - convert oslDateTime to tools DateTime */ -static DateTime impl_oslDateTimeToDateTime(const oslDateTime& aDateTime) -{ - return DateTime( - Date(aDateTime.Day, aDateTime.Month, aDateTime.Year), - Time(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds)); -} - -/* Local function - get DateTime from a string */ -static sal_Bool impl_parseDateTime(const OUString& aString, DateTime& aDateTime) -{ - // take apart a canonical literal xsd:dateTime string - //CCYY-MM-DDThh:mm:ss(Z) - - OUString aDateTimeString = aString.trim(); - - // check length - if (aDateTimeString.getLength() < 19 || aDateTimeString.getLength() > 20) - return sal_False; - - sal_Int32 nDateLength = 10; - sal_Int32 nTimeLength = 8; - - OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T")); - OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-")); - OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":")); - OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z")); - - OUString aDateString = aDateTimeString.copy(0, nDateLength); - OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength); - - sal_Int32 nIndex = 0; - sal_Int32 nYear = aDateString.getToken(0, '-', nIndex).toInt32(); - sal_Int32 nMonth = aDateString.getToken(0, '-', nIndex).toInt32(); - sal_Int32 nDay = aDateString.getToken(0, '-', nIndex).toInt32(); - nIndex = 0; - sal_Int32 nHour = aTimeString.getToken(0, ':', nIndex).toInt32(); - sal_Int32 nMinute = aTimeString.getToken(0, ':', nIndex).toInt32(); - sal_Int32 nSecond = aTimeString.getToken(0, ':', nIndex).toInt32(); - - Date tmpDate((USHORT)nDay, (USHORT)nMonth, (USHORT)nYear); - Time tmpTime(nHour, nMinute, nSecond); - DateTime tmpDateTime(tmpDate, tmpTime); - if (aString.indexOf(aUTCString) < 0) - tmpDateTime.ConvertToUTC(); - - aDateTime = tmpDateTime; - return sal_True; -} - -/* Local function - was the license accepted already? */ -static sal_Bool impl_isLicenseAccepted() -{ - // If no license will be shown ... it must not be accepted. - // So it was accepted "hardly" by the outside installer. - // But if the configuration entry "HideEula" will be removed afterwards .. - // we have to show the licese page again and user has to accept it here .-) - if ( ! Desktop::LicenseNeedsAcceptance() ) - return sal_True; - - try - { - Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) ); - - Any result = xPSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LicenseAcceptDate"))); - - OUString aAcceptDate; - if (result >>= aAcceptDate) - { - // compare to date of license file - OUString aLicenseURL = Desktop::GetLicensePath(); - osl::DirectoryItem aDirItem; - if (osl::DirectoryItem::get(aLicenseURL, aDirItem) != osl::FileBase::E_None) - return sal_False; - osl::FileStatus aStatus(FileStatusMask_All); - if (aDirItem.getFileStatus(aStatus) != osl::FileBase::E_None) - return sal_False; - TimeValue aTimeVal = aStatus.getModifyTime(); - oslDateTime aDateTimeVal; - if (!osl_getDateTimeFromTimeValue(&aTimeVal, &aDateTimeVal)) - return sal_False; - - // compare dates - DateTime aLicenseDateTime = impl_oslDateTimeToDateTime(aDateTimeVal); - DateTime aAcceptDateTime; - if (!impl_parseDateTime(aAcceptDate, aAcceptDateTime)) - return sal_False; - - if ( aAcceptDateTime > aLicenseDateTime ) - return sal_True; - } - return sal_False; - } catch (const Exception&) - { - return sal_False; - } -} - -/* Check if we need the first start wizard. */ -sal_Bool Desktop::IsFirstStartWizardNeeded() -{ - return impl_isFirstStart() || !impl_isLicenseAccepted(); -} - void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart ) { if ( bQuickStart ) diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 677db8f24b..253462afa4 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -754,12 +754,6 @@ sal_Bool CommandLineArgs::IsTerminateAfterInit() const return m_aBoolParams[ CMD_BOOLPARAM_TERMINATEAFTERINIT ]; } -sal_Bool CommandLineArgs::IsNoFirstStartWizard() const -{ - osl::MutexGuard aMutexGuard( m_aMutex ); - return m_aBoolParams[ CMD_BOOLPARAM_NOFIRSTSTARTWIZARD ]; -} - sal_Bool CommandLineArgs::IsNoLogo() const { osl::MutexGuard aMutexGuard( m_aMutex ); diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index 05b31f40ec..7dc1d8001d 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -143,7 +143,6 @@ class CommandLineArgs sal_Bool IsQuickstart() const; sal_Bool IsNoQuickstart() const; sal_Bool IsTerminateAfterInit() const; - sal_Bool IsNoFirstStartWizard() const; sal_Bool IsNoLogo() const; sal_Bool IsNoLockcheck() const; sal_Bool IsHelp() const; diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx index db787eb578..8bd219c1ed 100644 --- a/desktop/source/deployment/dp_xml.cxx +++ b/desktop/source/deployment/dp_xml.cxx @@ -45,20 +45,6 @@ namespace dp_misc //============================================================================== void xml_parse( - Reference<xml::input::XRoot> const & xRoot, - ::ucbhelper::Content & ucb_content, - Reference<XComponentContext> const & xContext ) -{ - const Any arg(xRoot); - const Reference<xml::sax::XDocumentHandler> xDocHandler( - xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - OUSTR("com.sun.star.xml.input.SaxDocumentHandler"), - Sequence<Any>( &arg, 1 ), xContext ), UNO_QUERY_THROW ); - xml_parse( xDocHandler, ucb_content, xContext ); - } - -//============================================================================== -void xml_parse( Reference<xml::sax::XDocumentHandler> const & xDocHandler, ::ucbhelper::Content & ucb_content, Reference<XComponentContext> const & xContext ) diff --git a/desktop/source/deployment/gui/dp_gui_system.cxx b/desktop/source/deployment/gui/dp_gui_system.cxx deleted file mode 100644 index 0e6416f161..0000000000 --- a/desktop/source/deployment/gui/dp_gui_system.cxx +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_desktop.hxx" - -#include "dp_gui_system.hxx" -#ifdef WNT -#define WIN32_LEAN_AND_MEAN -#ifdef _MSC_VER -#pragma warning(push,1) /* disable warnings within system headers */ -#endif -#include <windows.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif -#endif - -namespace dp_gui { - -//We cannot distinguish Vista and 2008 Server -bool isVista() -{ -#ifdef WNT - OSVERSIONINFO osvi; - ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&osvi); - return osvi.dwMajorVersion >= 6; -#else - return false; -#endif -} - -} //namespace dp_gui - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_system.hxx b/desktop/source/deployment/gui/dp_gui_system.hxx deleted file mode 100644 index 8c8feb43cf..0000000000 --- a/desktop/source/deployment/gui/dp_gui_system.hxx +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SYSTEM_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SYSTEM_HXX - - -/// @HTML -namespace dp_gui { -bool isVista(); - -} -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index c3ac936dfc..7d4ba304a2 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -121,7 +121,6 @@ #include "dp_gui_updatedata.hxx" #include "dp_gui_updatedialog.hxx" #include "dp_gui_shared.hxx" -#include "dp_gui_system.hxx" class KeyEvent; class MouseEvent; @@ -239,25 +238,6 @@ private: Thread(UpdateDialog::Thread &); // not defined void operator =(UpdateDialog::Thread &); // not defined - struct Entry { - explicit Entry( - css::uno::Reference< css::deployment::XPackage > const & thePackage, - rtl::OUString const & theVersion); - - css::uno::Reference< css::deployment::XPackage > package; - rtl::OUString version; - //Indicates that the extension provides its own update URLs. - //If this is true, then we must not use the default update - //URL to find the update information. - bool bProvidesOwnUpdate; - css::uno::Reference< css::xml::dom::XNode > info; - UpdateDialog::DisabledUpdate disableUpdate; - dp_gui::UpdateData updateData; - }; - - // A multimap in case an extension is installed in "user", "shared" or "bundled" - typedef std::map< rtl::OUString, Entry > Map; - virtual ~Thread(); virtual void execute(); @@ -272,10 +252,6 @@ private: css::uno::Sequence< rtl::OUString > const & urls, rtl::OUString const & identifier) const; - void getOwnUpdateInformation( - css::uno::Reference< css::deployment::XPackage > const & package, - Map * map); - ::rtl::OUString getUpdateDisplayString( dp_gui::UpdateData const & data, ::rtl::OUString const & version = ::rtl::OUString()) const; @@ -338,17 +314,6 @@ void UpdateDialog::Thread::stop() { m_updateInformation->cancel(); } -UpdateDialog::Thread::Entry::Entry( - css::uno::Reference< css::deployment::XPackage > const & thePackage, - rtl::OUString const & theVersion): - - package(thePackage), - version(theVersion), - bProvidesOwnUpdate(false), - updateData(thePackage) -{ -} - UpdateDialog::Thread::~Thread() { if ( m_xInteractionHdl.is() ) @@ -1030,16 +995,6 @@ bool UpdateDialog::showDescription( const String& rDescription, bool bWithPublis return true; } -bool UpdateDialog::isReadOnly( const css::uno::Reference< css::deployment::XPackage > &xPackage ) const -{ - if ( m_xExtensionManager.is() && xPackage.is() ) - { - return m_xExtensionManager->isReadOnlyRepository( xPackage->getRepositoryName() ); - } - else - return true; -} - IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) { rtl::OUStringBuffer b; @@ -1216,7 +1171,6 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG) OSL_ASSERT(i->aInstalledPackage.is()); //If the user has no write access to the shared folder then the update //for a shared extension is disable, that is it cannot be in m_enabledUpdates -// OSL_ASSERT(isReadOnly(i->aInstalledPackage) == sal_False); } diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk index 52092a077a..9f1a501342 100644 --- a/desktop/source/deployment/gui/makefile.mk +++ b/desktop/source/deployment/gui/makefile.mk @@ -55,7 +55,6 @@ SLOFILES = \ $(SLO)$/dp_gui_updatedialog.obj \ $(SLO)$/dp_gui_updateinstalldialog.obj \ $(SLO)$/dp_gui_autoscrolledit.obj \ - $(SLO)$/dp_gui_system.obj \ $(SLO)$/dp_gui_extensioncmdqueue.obj \ $(SLO)$/descedit.obj diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 951a3af8ac..88f5279d61 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -141,7 +141,6 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend void addDataToDb(OUString const & url, ConfigurationBackendDb::Data const & data); ::boost::optional<ConfigurationBackendDb::Data> readDataFromDb(OUString const & url); OUString deleteDataFromDb(OUString const & url); - ::std::list<OUString> getAllIniEntries(); public: BackendImpl( Sequence<Any> const & args, @@ -255,16 +254,6 @@ OUString BackendImpl::deleteDataFromDb(OUString const & url) return url2; } -::std::list<OUString> BackendImpl::getAllIniEntries() -{ - if (m_backendDb.get()) - return m_backendDb->getAllIniEntries(); - else - return ::std::list<OUString>(); -} - - - // XPackageRegistry //______________________________________________________________________________ Sequence< Reference<deployment::XPackageTypeInfo> > diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx index a0cafe0331..9c0807de06 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx @@ -171,13 +171,6 @@ ConfigurationBackendDb::getEntry(::rtl::OUString const & url) } } -::std::list<OUString> ConfigurationBackendDb::getAllIniEntries() -{ - return getOneChildFromAllEntries(OUSTR("ini-entry")); -} - - - } // namespace configuration } // namespace backend } // namespace dp_registry diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index 7cb02edf55..a652184aec 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -82,7 +82,6 @@ public: ::boost::optional<Data> getEntry(::rtl::OUString const & url); ::std::list< ::rtl::OUString> getAllDataUrls(); - ::std::list< ::rtl::OUString> getAllIniEntries(); }; diff --git a/desktop/source/migration/cfgfilter.cxx b/desktop/source/migration/cfgfilter.cxx deleted file mode 100644 index 5928ad8ce7..0000000000 --- a/desktop/source/migration/cfgfilter.cxx +++ /dev/null @@ -1,336 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_desktop.hxx" -#include "cfgfilter.hxx" - -#include <com/sun/star/beans/NamedValue.hpp> -#include <unotools/textsearch.hxx> - -using namespace rtl; -using namespace com::sun::star; -using namespace com::sun::star::uno; -using namespace com::sun::star::lang; -using namespace com::sun::star::beans; -using namespace com::sun::star::configuration::backend; - -namespace desktop { - -CConfigFilter::CConfigFilter(const strings_v* include, const strings_v* exclude) - : m_pvInclude(include) - , m_pvExclude(exclude) -{ -} - -void SAL_CALL CConfigFilter::initialize(const Sequence< Any >& seqArgs) - throw (Exception) -{ - NamedValue nv; - for (sal_Int32 i=0; i < seqArgs.getLength(); ++i) - { - if (seqArgs[i] >>= nv) - { - if (nv.Name.equalsAscii("Source")) - nv.Value >>= m_xSourceLayer; - if (nv.Name.equalsAscii("ComponentName")) - nv.Value >>= m_aCurrentComponent; - } - } - if (m_aCurrentComponent.getLength() == 0) - m_aCurrentComponent = OUString(RTL_CONSTASCII_USTRINGPARAM("unknown.component")); - - if (!m_xSourceLayer.is()) { - throw Exception(); - } - -} - - -void CConfigFilter::pushElement(rtl::OUString aName, sal_Bool bUse) -{ - OUString aPath; - if (!m_elementStack.empty()) { - aPath = m_elementStack.top().path; // or use base path - aPath += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - } - aPath += aName; - - // create element - element elem; - elem.name = aName; - elem.path = aPath; - elem.use = bUse; - m_elementStack.push(elem); -} - -sal_Bool CConfigFilter::checkCurrentElement() -{ - return m_elementStack.top().use; -} - -sal_Bool CConfigFilter::checkElement(rtl::OUString aName) -{ - - sal_Bool bResult = sal_False; - - // get full pathname for element - OUString aFullPath; - if (!m_elementStack.empty()) - aFullPath = m_elementStack.top().path + OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - - aFullPath += aName; - - // check whether any include patterns patch this path - for (strings_v::const_iterator i_in = m_pvInclude->begin(); - i_in != m_pvInclude->end(); ++i_in) - { - // pattern is beginning of path - // or path is a begiing for pattern - if (i_in->match(aFullPath.copy(0, i_in->getLength()>aFullPath.getLength() - ? aFullPath.getLength() : i_in->getLength()), 0)) - { - bResult = sal_True; - break; // one match is enough - } - } - // if match is found, check for exclusion - if (bResult) - { - for (strings_v::const_iterator i_ex = m_pvExclude->begin(); - i_ex != m_pvExclude->end(); ++i_ex) - { - if (aFullPath.match(*i_ex, 0)) // pattern is beginning of path - { - bResult = sal_False; - break; // one is enough... - } - } - } - return bResult; -} - -void CConfigFilter::popElement() -{ - m_elementStack.pop(); -} - - -void SAL_CALL CConfigFilter::readData( - const Reference< configuration::backend::XLayerHandler >& layerHandler) - throw ( - com::sun::star::lang::NullPointerException, lang::WrappedTargetException, - com::sun::star::configuration::backend::MalformedDataException) -{ - // when readData is called, the submitted handler will be stored - // in m_xLayerHandler. we will then submit ourself as a handler to - // the SourceLayer in m_xSourceLayer. - // when the source calls our handler functions we will use the patterns that - // where given in the ctor to decide whther they should be relaied to the caller - - if (m_xSourceLayer.is() && layerHandler.is()) - { - m_xLayerHandler = layerHandler; - m_xSourceLayer->readData(Reference<XLayerHandler>(static_cast< XLayerHandler* >(this))); - } else - { - throw NullPointerException(); - } -} - -// XLayerHandler -void SAL_CALL CConfigFilter::startLayer() - throw(::com::sun::star::lang::WrappedTargetException) -{ - m_xLayerHandler->startLayer(); -} - -void SAL_CALL CConfigFilter::endLayer() - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - m_xLayerHandler->endLayer(); -} - -void SAL_CALL CConfigFilter::overrideNode( - const OUString& aName, - sal_Int16 aAttributes, - sal_Bool bClear) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - if (checkElement(aName)) - { - m_xLayerHandler->overrideNode(aName, aAttributes, bClear); - pushElement(aName); - } - else - pushElement(aName, sal_False); -} - -void SAL_CALL CConfigFilter::addOrReplaceNode( - const OUString& aName, - sal_Int16 aAttributes) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - if (checkElement(aName)) - { - m_xLayerHandler->addOrReplaceNode(aName, aAttributes); - pushElement(aName); - } - else - pushElement(aName, sal_False); -} - -void SAL_CALL CConfigFilter::addOrReplaceNodeFromTemplate( - const OUString& aName, - const com::sun::star::configuration::backend::TemplateIdentifier& aTemplate, - sal_Int16 aAttributes ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - if (checkElement(aName)) - { - m_xLayerHandler->addOrReplaceNodeFromTemplate(aName, aTemplate, aAttributes); - pushElement(aName); - } - else - pushElement(aName, sal_False); -} - -void SAL_CALL CConfigFilter::endNode() - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - if (checkCurrentElement()) - { - m_xLayerHandler->endNode(); - } - popElement(); -} - -void SAL_CALL CConfigFilter::dropNode( - const OUString& aName ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - // does not get pushed - if (checkElement(aName)) - { - m_xLayerHandler->dropNode(aName); - } -} - -void SAL_CALL CConfigFilter::overrideProperty( - const OUString& aName, - sal_Int16 aAttributes, - const Type& aType, - sal_Bool bClear ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - if (checkElement(aName)){ - m_xLayerHandler->overrideProperty(aName, aAttributes, aType, bClear); - pushElement(aName); - } - else - pushElement(aName, sal_False); -} - -void SAL_CALL CConfigFilter::setPropertyValue( - const Any& aValue ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - if (checkCurrentElement()) - m_xLayerHandler->setPropertyValue(aValue); -} - -void SAL_CALL CConfigFilter::setPropertyValueForLocale( - const Any& aValue, - const OUString& aLocale ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - if (checkCurrentElement()) - m_xLayerHandler->setPropertyValueForLocale(aValue, aLocale); -} - -void SAL_CALL CConfigFilter::endProperty() - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - if (checkCurrentElement()) - { - m_xLayerHandler->endProperty(); - } - popElement(); - -} - -void SAL_CALL CConfigFilter::addProperty( - const rtl::OUString& aName, - sal_Int16 aAttributes, - const Type& aType ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - if (checkElement(aName)) - m_xLayerHandler->addProperty(aName, aAttributes, aType); -} - -void SAL_CALL CConfigFilter::addPropertyWithValue( - const rtl::OUString& aName, - sal_Int16 aAttributes, - const Any& aValue ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ) -{ - // add property with value doesn't push the property - if (checkElement(aName)) - m_xLayerHandler->addPropertyWithValue(aName, aAttributes, aValue); - -} - -} // namespace desktop - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/cfgfilter.hxx b/desktop/source/migration/cfgfilter.hxx deleted file mode 100644 index cec890354e..0000000000 --- a/desktop/source/migration/cfgfilter.hxx +++ /dev/null @@ -1,175 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#ifndef _DESKTOP_CFGFILTER_HXX_ -#define _DESKTOP_CFGFILTER_HXX_ - -#include <stack> - -#include <sal/types.h> -#include <rtl/ustring.hxx> - -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> - -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Type.hxx> - -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/configuration/backend/XLayer.hpp> -#include <com/sun/star/configuration/backend/XLayerHandler.hpp> -#include <com/sun/star/configuration/backend/TemplateIdentifier.hpp> - - -#include "migration_impl.hxx" - -#define NS_CSS com::sun::star -#define NS_UNO com::sun::star::uno - - -namespace desktop { - -struct element -{ - rtl::OUString name; - rtl::OUString path; - sal_Bool use; - -}; - -typedef std::stack< element > element_stack; - -// XInitialization: -// -> Source : XLayer -// XLayer -// XLayerHandler -class CConfigFilter : public cppu::WeakImplHelper3< - NS_CSS::configuration::backend::XLayer, - NS_CSS::configuration::backend::XLayerHandler, - NS_CSS::lang::XInitialization> -{ - -private: - NS_UNO::Reference< NS_CSS::configuration::backend::XLayerHandler > m_xLayerHandler; - NS_UNO::Reference< NS_CSS::configuration::backend::XLayer > m_xSourceLayer; - - rtl::OUString m_aCurrentComponent; - - const strings_v *m_pvInclude; - const strings_v *m_pvExclude; - - element_stack m_elementStack; - - void pushElement(rtl::OUString aName, sal_Bool bUse = sal_True); - void popElement(); - sal_Bool checkElement(rtl::OUString aName); - sal_Bool checkCurrentElement(); - -public: - CConfigFilter(const strings_v* include, const strings_v* exclude); - - // XInitialization - virtual void SAL_CALL initialize(const NS_UNO::Sequence< NS_UNO::Any >& seqArgs) - throw (NS_UNO::Exception); - - // XLayer - virtual void SAL_CALL readData( - const NS_UNO::Reference< NS_CSS::configuration::backend::XLayerHandler >& layerHandler) - throw (NS_CSS::lang::NullPointerException, NS_CSS::lang::WrappedTargetException, - NS_CSS::configuration::backend::MalformedDataException); - - // XLayerHandler - virtual void SAL_CALL startLayer() - throw(::com::sun::star::lang::WrappedTargetException); - - virtual void SAL_CALL endLayer() - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL overrideNode( - const rtl::OUString& aName, - sal_Int16 aAttributes, - sal_Bool bClear) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL addOrReplaceNode( - const rtl::OUString& aName, - sal_Int16 aAttributes) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL addOrReplaceNodeFromTemplate( - const rtl::OUString& aName, - const NS_CSS::configuration::backend::TemplateIdentifier& aTemplate, - sal_Int16 aAttributes ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL endNode() - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL dropNode( - const rtl::OUString& aName ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL overrideProperty( - const rtl::OUString& aName, - sal_Int16 aAttributes, - const NS_UNO::Type& aType, - sal_Bool bClear ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL setPropertyValue( - const NS_UNO::Any& aValue ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL setPropertyValueForLocale( - const NS_UNO::Any& aValue, - const rtl::OUString& aLocale ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL endProperty() - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL addProperty( - const rtl::OUString& aName, - sal_Int16 aAttributes, - const NS_UNO::Type& aType ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - - virtual void SAL_CALL addPropertyWithValue( - const rtl::OUString& aName, - sal_Int16 aAttributes, - const NS_UNO::Any& aValue ) - throw( - ::com::sun::star::configuration::backend::MalformedDataException, - ::com::sun::star::lang::WrappedTargetException ); - -}; - -} // namespace desktop -#undef NS_CSS -#undef NS_UNO - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/makefile.mk b/desktop/source/migration/makefile.mk index 2624fcda5a..b20b4c5797 100644 --- a/desktop/source/migration/makefile.mk +++ b/desktop/source/migration/makefile.mk @@ -45,8 +45,7 @@ CDEFS+=-I..$/app CDEFS+=-I$(PRJ)/inc SLOFILES = \ - $(SLO)$/migration.obj \ - $(SLO)$/cfgfilter.obj + $(SLO)$/migration.obj # --- Targets ------------------------------------------------------ diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index e66d1269ea..20c0b0508a 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -35,7 +35,6 @@ #include "migration.hxx" #include "migration_impl.hxx" -#include "cfgfilter.hxx" #include <unotools/textsearch.hxx> #include <comphelper/processfactory.hxx> @@ -136,19 +135,6 @@ static const ::rtl::OUString MIGRATION_STAMP_NAME(RTL_CONSTASCII_USTRINGPARAM("/ return sLabel; } -::rtl::OUString stripHotKey( const ::rtl::OUString& str ) -{ - sal_Int32 index = str.indexOf( '~' ); - if ( index == -1 ) - { - return str; - } - else - { - return str.replaceAt( index, 1, ::rtl::OUString() ); - } -} - ::rtl::OUString mapModuleShortNameToIdentifier(const ::rtl::OUString& sShortName) { ::rtl::OUString sIdentifier; diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index e62cd1e2e2..c4586a98dd 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -434,28 +434,6 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) thro } } -// ----------------------------------------------------------------------------- - -TStringVectorPtr getContent( const ::rtl::OUString& rBaseURL ) -{ - TStringVectorPtr aResult( new TStringVector ); - ::osl::Directory aDir( rBaseURL); - if ( aDir.open() == ::osl::FileBase::E_None ) - { - // iterate over directory content - TStringVector aSubDirs; - ::osl::DirectoryItem aItem; - while ( aDir.getNextItem( aItem ) == ::osl::FileBase::E_None ) - { - ::osl::FileStatus aFileStatus( FileStatusMask_Type | FileStatusMask_FileURL ); - if ( aItem.getFileStatus( aFileStatus ) == ::osl::FileBase::E_None ) - aResult->push_back( aFileStatus.getFileURL() ); - } - } - - return aResult; -} - Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& ) throw (lang::IllegalArgumentException, Exception, RuntimeException) { diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk index 01f1287bc7..351b055435 100644 --- a/desktop/source/splash/makefile.mk +++ b/desktop/source/splash/makefile.mk @@ -44,8 +44,7 @@ SLOFILES = $(SLO)$/splash.obj \ SHL1DEPN= makefile.mk SHL1OBJS= $(SLOFILES) \ - $(SLO)$/migration.obj \ - $(SLO)$/cfgfilter.obj + $(SLO)$/migration.obj SHL1TARGET=$(TARGET)$(DLLPOSTFIX) diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx index ea13f1b381..261fb5c8b2 100644 --- a/desktop/unx/splash/unxsplash.cxx +++ b/desktop/unx/splash/unxsplash.cxx @@ -159,22 +159,6 @@ const sal_Char *UnxSplashScreen::serviceName = "com.sun.star.office.PipeSplashSc const sal_Char *UnxSplashScreen::implementationName = "com.sun.star.office.comp.PipeSplashScreen"; const sal_Char *UnxSplashScreen::supportedServiceNames[] = { "com.sun.star.office.PipeSplashScreen", NULL }; -OUString UnxSplashScreen::impl_getImplementationName() -{ - return OUString::createFromAscii( implementationName ); -} - -Sequence<OUString> UnxSplashScreen::impl_getSupportedServiceNames() -{ - Sequence<OUString> aSequence; - for ( int i = 0; supportedServiceNames[i] != NULL; i++ ) - { - aSequence.realloc( i+1 ); - aSequence[i] = OUString::createFromAscii( supportedServiceNames[i] ); - } - return aSequence; -} - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/unx/splash/unxsplash.hxx b/desktop/unx/splash/unxsplash.hxx index 31f57efbec..abe5a8cac2 100644 --- a/desktop/unx/splash/unxsplash.hxx +++ b/desktop/unx/splash/unxsplash.hxx @@ -73,10 +73,6 @@ public: static Reference< XInterface > getInstance( const Reference < XMultiServiceFactory >& xFactory ); - // static service info - static OUString impl_getImplementationName(); - static Sequence<OUString> impl_getSupportedServiceNames(); - // XStatusIndicator virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( RuntimeException ); virtual void SAL_CALL end() throw ( RuntimeException ); |