diff options
Diffstat (limited to 'desktop/source/migration')
18 files changed, 270 insertions, 270 deletions
diff --git a/desktop/source/migration/cfgfilter.cxx b/desktop/source/migration/cfgfilter.cxx index 7ee970235acc..2e5a20e708c6 100644 --- a/desktop/source/migration/cfgfilter.cxx +++ b/desktop/source/migration/cfgfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -45,9 +45,9 @@ namespace desktop { CConfigFilter::CConfigFilter(const strings_v* include, const strings_v* exclude) : m_pvInclude(include) - , m_pvExclude(exclude) + , m_pvExclude(exclude) { -} +} void SAL_CALL CConfigFilter::initialize(const Sequence< Any >& seqArgs) throw (Exception) @@ -65,7 +65,7 @@ void SAL_CALL CConfigFilter::initialize(const Sequence< Any >& seqArgs) } if (m_aCurrentComponent.getLength() == 0) m_aCurrentComponent = OUString::createFromAscii("unknown.component"); - + if (!m_xSourceLayer.is()) { throw Exception(); } @@ -79,7 +79,7 @@ void CConfigFilter::pushElement(rtl::OUString aName, sal_Bool bUse) if (!m_elementStack.empty()) { aPath = m_elementStack.top().path; // or use base path aPath += OUString::createFromAscii("/"); - } + } aPath += aName; // create element @@ -106,19 +106,19 @@ sal_Bool CConfigFilter::checkElement(rtl::OUString aName) aFullPath = m_elementStack.top().path + OUString::createFromAscii("/"); 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)) + 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) @@ -142,13 +142,13 @@ void CConfigFilter::popElement() } -void SAL_CALL CConfigFilter::readData( +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 + // 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 @@ -165,23 +165,23 @@ void SAL_CALL CConfigFilter::readData( } // XLayerHandler -void SAL_CALL CConfigFilter::startLayer() +void SAL_CALL CConfigFilter::startLayer() throw(::com::sun::star::lang::WrappedTargetException) { m_xLayerHandler->startLayer(); } -void SAL_CALL CConfigFilter::endLayer() - throw( +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, +void SAL_CALL CConfigFilter::overrideNode( + const OUString& aName, + sal_Int16 aAttributes, sal_Bool bClear) throw( ::com::sun::star::configuration::backend::MalformedDataException, @@ -191,15 +191,15 @@ void SAL_CALL CConfigFilter::overrideNode( { 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( + const OUString& aName, + sal_Int16 aAttributes) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -212,10 +212,10 @@ void SAL_CALL CConfigFilter::addOrReplaceNode( pushElement(aName, sal_False); } -void SAL_CALL CConfigFilter::addOrReplaceNodeFromTemplate( +void SAL_CALL CConfigFilter::addOrReplaceNodeFromTemplate( const OUString& aName, const com::sun::star::configuration::backend::TemplateIdentifier& aTemplate, - sal_Int16 aAttributes ) + sal_Int16 aAttributes ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) @@ -229,21 +229,21 @@ void SAL_CALL CConfigFilter::addOrReplaceNodeFromTemplate( pushElement(aName, sal_False); } -void SAL_CALL CConfigFilter::endNode() - throw( +void SAL_CALL CConfigFilter::endNode() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { if (checkCurrentElement()) { - m_xLayerHandler->endNode(); + m_xLayerHandler->endNode(); } popElement(); } -void SAL_CALL CConfigFilter::dropNode( - const OUString& aName ) - throw( +void SAL_CALL CConfigFilter::dropNode( + const OUString& aName ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -254,12 +254,12 @@ void SAL_CALL CConfigFilter::dropNode( } } -void SAL_CALL CConfigFilter::overrideProperty( +void SAL_CALL CConfigFilter::overrideProperty( const OUString& aName, sal_Int16 aAttributes, const Type& aType, - sal_Bool bClear ) - throw( + sal_Bool bClear ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -271,9 +271,9 @@ void SAL_CALL CConfigFilter::overrideProperty( pushElement(aName, sal_False); } -void SAL_CALL CConfigFilter::setPropertyValue( - const Any& aValue ) - throw( +void SAL_CALL CConfigFilter::setPropertyValue( + const Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -281,10 +281,10 @@ void SAL_CALL CConfigFilter::setPropertyValue( m_xLayerHandler->setPropertyValue(aValue); } -void SAL_CALL CConfigFilter::setPropertyValueForLocale( +void SAL_CALL CConfigFilter::setPropertyValueForLocale( const Any& aValue, - const OUString& aLocale ) - throw( + const OUString& aLocale ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -292,8 +292,8 @@ void SAL_CALL CConfigFilter::setPropertyValueForLocale( m_xLayerHandler->setPropertyValueForLocale(aValue, aLocale); } -void SAL_CALL CConfigFilter::endProperty() - throw( +void SAL_CALL CConfigFilter::endProperty() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -305,30 +305,30 @@ void SAL_CALL CConfigFilter::endProperty() } -void SAL_CALL CConfigFilter::addProperty( +void SAL_CALL CConfigFilter::addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const Type& aType ) - throw( + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { - if (checkElement(aName)) + if (checkElement(aName)) m_xLayerHandler->addProperty(aName, aAttributes, aType); } -void SAL_CALL CConfigFilter::addPropertyWithValue( +void SAL_CALL CConfigFilter::addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, - const Any& aValue ) - throw( + 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)) + if (checkElement(aName)) m_xLayerHandler->addPropertyWithValue(aName, aAttributes, aValue); - + } } // namespace desktop diff --git a/desktop/source/migration/cfgfilter.hxx b/desktop/source/migration/cfgfilter.hxx index 44a5006e8cd3..cec890354e5e 100644 --- a/desktop/source/migration/cfgfilter.hxx +++ b/desktop/source/migration/cfgfilter.hxx @@ -33,7 +33,7 @@ struct element rtl::OUString name; rtl::OUString path; sal_Bool use; - + }; typedef std::stack< element > element_stack; @@ -43,13 +43,13 @@ typedef std::stack< element > element_stack; // XLayer // XLayerHandler class CConfigFilter : public cppu::WeakImplHelper3< - NS_CSS::configuration::backend::XLayer, + 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::XLayerHandler > m_xLayerHandler; NS_UNO::Reference< NS_CSS::configuration::backend::XLayer > m_xSourceLayer; rtl::OUString m_aCurrentComponent; @@ -72,94 +72,94 @@ public: throw (NS_UNO::Exception); // XLayer - virtual void SAL_CALL readData( + 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() + virtual void SAL_CALL startLayer() throw(::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL endLayer() - throw( + 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, + 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( + const rtl::OUString& aName, + sal_Int16 aAttributes) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addOrReplaceNodeFromTemplate( + virtual void SAL_CALL addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const NS_CSS::configuration::backend::TemplateIdentifier& aTemplate, - sal_Int16 aAttributes ) + sal_Int16 aAttributes ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endNode() - throw( + 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( + 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( + virtual void SAL_CALL overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const NS_UNO::Type& aType, - sal_Bool bClear ) - throw( + 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( + 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( + virtual void SAL_CALL setPropertyValueForLocale( const NS_UNO::Any& aValue, - const rtl::OUString& aLocale ) - throw( + const rtl::OUString& aLocale ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endProperty() - throw( + virtual void SAL_CALL endProperty() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addProperty( + virtual void SAL_CALL addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const NS_UNO::Type& aType ) - throw( + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addPropertyWithValue( + virtual void SAL_CALL addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, - const NS_UNO::Any& aValue ) - throw( + const NS_UNO::Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 0f3726e663a0..e66d1269ea63 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -451,7 +451,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio // get migration access uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW); uno::Reference< XNameAccess > xMigrationData( aMigrationAccess->getByName(rMigrationName), uno::UNO_QUERY_THROW ); - + // get migration description from from org.openoffice.Setup/Migration // and build vector of migration steps OUString aMigrationSteps( RTL_CONSTASCII_USTRINGPARAM( "MigrationSteps" )); @@ -559,7 +559,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions) aProfileName = (*i_ver).copy( nSeparatorIndex+1 ); } - if ( aVersion.getLength() && aProfileName.getLength() && + if ( aVersion.getLength() && aProfileName.getLength() && ( !aInfo.userdata.getLength() || !aProfileName.toAsciiLowerCase().compareTo( aProductName, aProductName.getLength() ) ) ) { @@ -1021,7 +1021,7 @@ void MigrationImpl::runServices() for (sal_Int32 j=0; j<lToolbars.getLength(); ++j) { ::rtl::OUString sToolbarName = lToolbars[j]; - if (sToolbarName.getLength()>=nCustomLen && + if (sToolbarName.getLength()>=nCustomLen && sToolbarName.copy(0, nCustomLen).equals(RESOURCEURL_CUSTOM_ELEMENT)) continue; @@ -1109,7 +1109,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, } else if (pFound == vNewItems.end()) { - MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); + MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); if (m_aOldVersionItemsHashMap.find(sResourceURL)==m_aOldVersionItemsHashMap.end()) { ::std::vector< MigrationItem > vMigrationItems; @@ -1142,7 +1142,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, } else if (::std::find(vOldItems.begin(), vOldItems.end(), *it) == vOldItems.end()) { - MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); + MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); if (m_aNewVersionItemsHashMap.find(sResourceURL)==m_aNewVersionItemsHashMap.end()) { ::std::vector< MigrationItem > vMigrationItems; @@ -1158,9 +1158,9 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, } } -void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurationManager >& xCfgManager, - const uno::Reference< container::XIndexContainer>& xIndexContainer, - const ::rtl::OUString& sModuleIdentifier, +void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurationManager >& xCfgManager, + const uno::Reference< container::XIndexContainer>& xIndexContainer, + const ::rtl::OUString& sModuleIdentifier, const ::rtl::OUString& sResourceURL) { MigrationHashMap::iterator pFound = m_aOldVersionItemsHashMap.find(sResourceURL); @@ -1174,7 +1174,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat ::rtl::OUString sParentNodeName = it->m_sParentNodeName; sal_Int32 nIndex = 0; - do + do { ::rtl::OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim(); if (sToken.getLength()<=0) @@ -1187,7 +1187,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat ::rtl::OUString sLabel; uno::Reference< container::XIndexContainer > xChild; - uno::Sequence< beans::PropertyValue > aPropSeq; + uno::Sequence< beans::PropertyValue > aPropSeq; xTemp->getByIndex(i) >>= aPropSeq; for (sal_Int32 j=0; j<aPropSeq.getLength(); ++j) { @@ -1259,14 +1259,14 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat } uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager(const ::rtl::OUString& sModuleShortName) const -{ +{ uno::Reference< ui::XUIConfigurationManager > xCfgManager; for (sal_Int32 i=0; i<m_lCfgManagerSeq.getLength(); ++i) { if (m_lCfgManagerSeq[i].Name.equals(sModuleShortName)) { - m_lCfgManagerSeq[i].Value >>= xCfgManager; + m_lCfgManagerSeq[i].Value >>= xCfgManager; break; } } diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index ebb7c96c620c..d66cabad941e 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -106,21 +106,21 @@ struct MigrationItem { } - MigrationItem(const ::rtl::OUString& sParentNodeName, - const ::rtl::OUString& sPrevSibling, - const ::rtl::OUString& sCommandURL, + MigrationItem(const ::rtl::OUString& sParentNodeName, + const ::rtl::OUString& sPrevSibling, + const ::rtl::OUString& sCommandURL, const NS_UNO::Reference< NS_CSS::container::XIndexContainer > xPopupMenu) { m_sParentNodeName = sParentNodeName; - m_sPrevSibling = sPrevSibling; - m_sCommandURL = sCommandURL; - m_xPopupMenu = xPopupMenu; + m_sPrevSibling = sPrevSibling; + m_sCommandURL = sCommandURL; + m_xPopupMenu = xPopupMenu; } MigrationItem& operator=(const MigrationItem& aMigrationItem) { m_sParentNodeName = aMigrationItem.m_sParentNodeName; - m_sPrevSibling = aMigrationItem.m_sPrevSibling; + m_sPrevSibling = aMigrationItem.m_sPrevSibling; m_sCommandURL = aMigrationItem.m_sCommandURL; m_xPopupMenu = aMigrationItem.m_xPopupMenu; @@ -130,17 +130,17 @@ struct MigrationItem sal_Bool operator==(const MigrationItem& aMigrationItem) { return ( aMigrationItem.m_sParentNodeName == m_sParentNodeName && - aMigrationItem.m_sPrevSibling == m_sPrevSibling && - aMigrationItem.m_sCommandURL == m_sCommandURL && + aMigrationItem.m_sPrevSibling == m_sPrevSibling && + aMigrationItem.m_sCommandURL == m_sCommandURL && aMigrationItem.m_xPopupMenu.is() == m_xPopupMenu.is() ); } ::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; } }; -typedef ::std::hash_map< ::rtl::OUString, - ::std::vector< MigrationItem >, - ::rtl::OUStringHash, +typedef ::std::hash_map< ::rtl::OUString, + ::std::vector< MigrationItem >, + ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > MigrationHashMap; struct MigrationItemInfo @@ -164,7 +164,7 @@ struct MigrationItemInfo struct MigrationModuleInfo { ::rtl::OUString sModuleShortName; - sal_Bool bHasMenubar; + sal_Bool bHasMenubar; ::std::vector< ::rtl::OUString > m_vToolbars; MigrationModuleInfo():bHasMenubar(sal_False){}; @@ -172,7 +172,7 @@ struct MigrationModuleInfo //__________________________________________ /** - get the information before copying the ui configuration files of old version to new version + get the information before copying the ui configuration files of old version to new version */ class NewVersionUIInfo { @@ -221,10 +221,10 @@ private: ::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const; void compareOldAndNewConfig(const ::rtl::OUString& sParentNodeName, - const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xOldIndexContainer, + const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xOldIndexContainer, const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xNewIndexContainer, const ::rtl::OUString& sToolbarName); - void mergeOldToNewVersion(const NS_UNO::Reference< NS_CSS::ui::XUIConfigurationManager >& xCfgManager, + void mergeOldToNewVersion(const NS_UNO::Reference< NS_CSS::ui::XUIConfigurationManager >& xCfgManager, const NS_UNO::Reference< NS_CSS::container::XIndexContainer>& xIndexContainer, const ::rtl::OUString& sModuleIdentifier, const ::rtl::OUString& sResourceURL); diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx index 3030b429d1e9..1f5290f383cf 100644 --- a/desktop/source/migration/services/autocorrmigration.cxx +++ b/desktop/source/migration/services/autocorrmigration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -282,7 +282,7 @@ namespace migration // ----------------------------------------------------------------------------- //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/autocorrmigration.hxx b/desktop/source/migration/services/autocorrmigration.hxx index 20021ceb100a..9a8aef32cdda 100644 --- a/desktop/source/migration/services/autocorrmigration.hxx +++ b/desktop/source/migration/services/autocorrmigration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -86,18 +86,18 @@ namespace migration throw (::com::sun::star::uno::RuntimeException); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XJob virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... #endif // _DESKTOP_AUTOCORRMIGRATION_HXX_ diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index 7fdf6e8d0b53..4ed093cfe446 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -271,7 +271,7 @@ namespace migration // ----------------------------------------------------------------------------- //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index 49260cadd522..131092748a63 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -58,14 +58,14 @@ namespace migration // class BasicMigration // ============================================================================= - typedef ::cppu::WeakImplHelper3< + typedef ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, ::com::sun::star::task::XJob > BasicMigration_BASE; class BasicMigration : public BasicMigration_BASE { - private: + private: ::osl::Mutex m_aMutex; ::rtl::OUString m_sSourceDir; @@ -86,18 +86,18 @@ namespace migration throw (::com::sun::star::uno::RuntimeException); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XJob virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... #endif // _DESKTOP_BASICMIGRATION_HXX_ diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx index fb102a67bf62..261cf266653c 100644 --- a/desktop/source/migration/services/cexports.cxx +++ b/desktop/source/migration/services/cexports.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx index ad40aef9db13..771c161879e0 100644 --- a/desktop/source/migration/services/cexportsoo3.cxx +++ b/desktop/source/migration/services/cexportsoo3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index d83d86179325..f6ad3f54bcac 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -111,7 +111,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); - //XInitialization + //XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException); @@ -122,88 +122,88 @@ public: css::uno::RuntimeException); // XLayerHandler - virtual void SAL_CALL startLayer() + virtual void SAL_CALL startLayer() throw(::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL endLayer() - throw( + 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, + 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( + const rtl::OUString& aName, + sal_Int16 aAttributes) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addOrReplaceNodeFromTemplate( + virtual void SAL_CALL addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const ::com::sun::star::configuration::backend::TemplateIdentifier& aTemplate, - sal_Int16 aAttributes ) + sal_Int16 aAttributes ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endNode() - throw( + 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( + 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( + virtual void SAL_CALL overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const css::uno::Type& aType, - sal_Bool bClear ) - throw( + sal_Bool bClear ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL setPropertyValue( - const css::uno::Any& aValue ) - throw( + virtual void SAL_CALL setPropertyValue( + const css::uno::Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL setPropertyValueForLocale( + virtual void SAL_CALL setPropertyValueForLocale( const css::uno::Any& aValue, - const rtl::OUString& aLocale ) - throw( + const rtl::OUString& aLocale ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endProperty() - throw( + virtual void SAL_CALL endProperty() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addProperty( + virtual void SAL_CALL addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const css::uno::Type& aType ) - throw( + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addPropertyWithValue( + virtual void SAL_CALL addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, - const css::uno::Any& aValue ) - throw( + const css::uno::Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); @@ -212,15 +212,15 @@ public: //---------------- ~JavaMigration(); -private: +private: OUString m_sUserDir; - css::uno::Reference< ::css::configuration::backend::XLayer> m_xLayer; + css::uno::Reference< ::css::configuration::backend::XLayer> m_xLayer; void migrateJavarc(); - typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; + typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; typedef ::std::stack< TElementType > TElementStack; TElementStack m_aStack; - + }; JavaMigration::~JavaMigration() @@ -319,7 +319,7 @@ css::uno::Any SAL_CALL JavaMigration::execute( migrateJavarc(); if (m_xLayer.is()) m_xLayer->readData(this); - + return css::uno::Any(); } @@ -338,7 +338,7 @@ void JavaMigration::migrateJavarc() //get the directory CJavaInfo aInfo; javaFrameworkError err = jfw_getJavaInfoByPath(sValue.pData, &aInfo.pData); - + if (err == JFW_E_NONE) { if (jfw_setSelectedJRE(aInfo) != JFW_E_NONE) @@ -358,65 +358,65 @@ void JavaMigration::migrateJavarc() // XLayerHandler -void SAL_CALL JavaMigration::startLayer() +void SAL_CALL JavaMigration::startLayer() throw(css::lang::WrappedTargetException) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::endLayer() - throw( +void SAL_CALL JavaMigration::endLayer() + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::overrideNode( - const ::rtl::OUString&, - sal_Int16, +void SAL_CALL JavaMigration::overrideNode( + const ::rtl::OUString&, + sal_Int16, sal_Bool) throw( MalformedDataException, WrappedTargetException ) - + { } // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::addOrReplaceNode( - const ::rtl::OUString&, - sal_Int16) - throw( + const ::rtl::OUString&, + sal_Int16) + throw( MalformedDataException, WrappedTargetException ) { } -void SAL_CALL JavaMigration::endNode() - throw( +void SAL_CALL JavaMigration::endNode() + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::dropNode( - const ::rtl::OUString& ) - throw( +void SAL_CALL JavaMigration::dropNode( + const ::rtl::OUString& ) + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::overrideProperty( +void SAL_CALL JavaMigration::overrideProperty( const ::rtl::OUString& aName, sal_Int16, const Type&, - sal_Bool ) - throw( + sal_Bool ) + throw( MalformedDataException, WrappedTargetException ) { @@ -427,9 +427,9 @@ void SAL_CALL JavaMigration::overrideProperty( } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::setPropertyValue( - const Any& aValue ) - throw( +void SAL_CALL JavaMigration::setPropertyValue( + const Any& aValue ) + throw( MalformedDataException, WrappedTargetException ) { @@ -448,9 +448,9 @@ void SAL_CALL JavaMigration::setPropertyValue( throw WrappedTargetException( OUSTR("[Service implementation " IMPL_NAME "] XLayerHandler::setPropertyValue: jfw_setEnabled failed."), 0, Any()); - + break; - } + } case USER_CLASS_PATH: { OUString cp; @@ -458,11 +458,11 @@ void SAL_CALL JavaMigration::setPropertyValue( throw MalformedDataException( OUSTR("[Service implementation " IMPL_NAME "] XLayerHandler::setPropertyValue received wrong type for UserClassPath property"), 0, Any()); - + if (jfw_setUserClassPath(cp.pData) != JFW_E_NONE) throw WrappedTargetException( OUSTR("[Service implementation " IMPL_NAME - "] XLayerHandler::setPropertyValue: jfw_setUserClassPath failed."), 0, Any()); + "] XLayerHandler::setPropertyValue: jfw_setUserClassPath failed."), 0, Any()); break; } default: @@ -472,18 +472,18 @@ void SAL_CALL JavaMigration::setPropertyValue( } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::setPropertyValueForLocale( +void SAL_CALL JavaMigration::setPropertyValueForLocale( const Any&, - const ::rtl::OUString& ) - throw( + const ::rtl::OUString& ) + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::endProperty() - throw( +void SAL_CALL JavaMigration::endProperty() + throw( MalformedDataException, WrappedTargetException ) { @@ -492,31 +492,31 @@ void SAL_CALL JavaMigration::endProperty() } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::addProperty( +void SAL_CALL JavaMigration::addProperty( const rtl::OUString&, sal_Int16, const Type& ) - throw( + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::addPropertyWithValue( +void SAL_CALL JavaMigration::addPropertyWithValue( const rtl::OUString&, sal_Int16, - const Any& ) - throw( + const Any& ) + throw( MalformedDataException, WrappedTargetException ) { } -void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate( +void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate( const rtl::OUString&, const TemplateIdentifier&, - sal_Int16 ) + sal_Int16 ) throw( MalformedDataException, WrappedTargetException ) diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx index c1938e03ae87..96e459521d93 100644 --- a/desktop/source/migration/services/jvmfwk.hxx +++ b/desktop/source/migration/services/jvmfwk.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/desktop/source/migration/services/migrationoo2.xml b/desktop/source/migration/services/migrationoo2.xml index 5bda732f0fba..0c77badebcd3 100644 --- a/desktop/source/migration/services/migrationoo2.xml +++ b/desktop/source/migration/services/migrationoo2.xml @@ -1,34 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name> migrationoo2.uno </module-name> + <module-name> migrationoo2.uno </module-name> <component-description> <author> Joachim Lingner </author> - <name> com.sun.star.comp.jvmfwk.MigrationOO2</name> + <name> com.sun.star.comp.jvmfwk.MigrationOO2</name> <description> Specifies a factory object to create proxy objects. These proxy object represent a given target object and can be be aggregated. The proxy objects act UNO conform and do NOT provide original target interfaces on queryInterface() calls. </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> - <language> C++ </language> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <language> C++ </language> <status value="final"/> - <supported-service> com.sun.star.reflection.ProxyFactory </supported-service> + <supported-service> com.sun.star.reflection.ProxyFactory </supported-service> <service-dependency> ... </service-dependency> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> <type> com.sun.star.lang.XInitialization </type> <type> com.sun.star.lang.WrappedTargetException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.task.XJob </type> - <type> com.sun.star.beans.NamedValue </type> - <type> com.sun.star.configuration.backend.XLayer </type> - <type> com.sun.star.configuration.backend.XLayerHandler </type> - <type> com.sun.star.configuration.backend.MalformedDataException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.task.XJob </type> + <type> com.sun.star.beans.NamedValue </type> + <type> com.sun.star.configuration.backend.XLayer </type> + <type> com.sun.star.configuration.backend.XLayerHandler </type> + <type> com.sun.star.configuration.backend.MalformedDataException </type> <type> com.sun.star.configuration.backend.TemplateIdentifier </type> </component-description> <component-description> @@ -41,7 +41,7 @@ original target interfaces on queryInterface() calls. <supported-service>com.sun.star.migration.Basic</supported-service> <service-dependency>...</service-dependency> <type>com.sun.star.beans.NamedValue</type> - <type>com.sun.star.lang.IllegalArgumentException</type> + <type>com.sun.star.lang.IllegalArgumentException</type> <type>com.sun.star.lang.XInitialization</type> <type>com.sun.star.task.XJob</type> <type>com.sun.star.lang.XServiceInfo</type> @@ -58,7 +58,7 @@ original target interfaces on queryInterface() calls. <supported-service>com.sun.star.migration.Autocorrection</supported-service> <service-dependency>...</service-dependency> <type>com.sun.star.beans.NamedValue</type> - <type>com.sun.star.lang.IllegalArgumentException</type> + <type>com.sun.star.lang.IllegalArgumentException</type> <type>com.sun.star.lang.XInitialization</type> <type>com.sun.star.task.XJob</type> <type>com.sun.star.lang.XServiceInfo</type> diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx index 54396863bb8c..a8f7babef982 100644 --- a/desktop/source/migration/services/misc.hxx +++ b/desktop/source/migration/services/misc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,7 +43,7 @@ namespace migration typedef ::std::auto_ptr< TStringVector > TStringVectorPtr; //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... #endif // _DESKTOP_MISC_HXX_ diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 9a0210eae411..e62cd1e2e2e2 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -156,14 +156,14 @@ void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDi osl::DirectoryItem aExtDirItem; osl::Directory aExtensionRootDir( sExtensionFolderURL ); - + nRetCode = aExtensionRootDir.open(); if (( nRetCode == osl::Directory::E_None ) && ( aExtensionRootDir.getNextItem( aExtDirItem, nHint ) == osl::Directory::E_None )) { bool bFileStatus = aExtDirItem.getFileStatus(fs) == osl::FileBase::E_None; bool bIsDir = fs.getFileType() == osl::FileStatus::Directory; - + if ( bFileStatus && bIsDir ) { sExtensionFolderURL = fs.getFileURL(); @@ -181,7 +181,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co { ScanResult aResult = SCANRESULT_NOTFOUND; osl::Directory aDir(sExtFolder); - + // get sub dirs if (aDir.open() == osl::FileBase::E_None) { @@ -233,13 +233,13 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), m_ctx ), uno::UNO_QUERY ); } - + ::rtl::OUString aExtIdentifier; if ( m_xDocBuilder.is() && m_xSimpleFileAccess.is() ) { try { - uno::Reference< io::XInputStream > xIn = + uno::Reference< io::XInputStream > xIn = m_xSimpleFileAccess->openFileRead( sDescriptionXmlURL ); if ( xIn.is() ) @@ -248,7 +248,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript if ( xDoc.is() ) { uno::Reference< xml::dom::XElement > xRoot = xDoc->getDocumentElement(); - if ( xRoot.is() && + if ( xRoot.is() && xRoot->getTagName().equals(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("description"))) ) { uno::Reference< xml::xpath::XXPathAPI > xPath( @@ -256,24 +256,24 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.xpath.XPathAPI")), m_ctx), uno::UNO_QUERY); - + xPath->registerNS( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc")), xRoot->getNamespaceURI()); xPath->registerNS( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xlink")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.w3.org/1999/xlink"))); - - try + + try { uno::Reference< xml::dom::XNode > xRootNode( xRoot, uno::UNO_QUERY ); - uno::Reference< xml::dom::XNode > xNode( + uno::Reference< xml::dom::XNode > xNode( xPath->selectSingleNode( - xRootNode, + xRootNode, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc:identifier/@value")) )); if ( xNode.is() ) aExtIdentifier = xNode->getNodeValue(); - } + } catch ( xml::xpath::XPathException& ) { } @@ -283,7 +283,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript } } } - + if ( aExtIdentifier.getLength() > 0 ) { // scan extension identifier and try to match with our black list entries @@ -308,9 +308,9 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript if ( aExtIdentifier.getLength() == 0 ) { - // Fallback: + // Fallback: // Try to use the folder name to match our black list - // as some extensions don't provide an identifier in the + // as some extensions don't provide an identifier in the // description.xml! for ( sal_uInt32 i = 0; i < m_aBlackList.size(); i++ ) { @@ -332,24 +332,24 @@ bool OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir { if ( !m_xExtensionManager.is() ) { - try + try { m_xExtensionManager = deployment::ExtensionManager::get( m_ctx ); } catch ( ucb::CommandFailedException & ){} catch ( uno::RuntimeException & ) {} } - + if ( m_xExtensionManager.is() ) { try { TmpRepositoryCommandEnv* pCmdEnv = new TmpRepositoryCommandEnv(); - - uno::Reference< ucb::XCommandEnvironment > xCmdEnv( + + uno::Reference< ucb::XCommandEnvironment > xCmdEnv( static_cast< cppu::OWeakObject* >( pCmdEnv ), uno::UNO_QUERY ); uno::Reference< task::XAbortChannel > xAbortChannel; - uno::Reference< deployment::XPackage > xPackage = + uno::Reference< deployment::XPackage > xPackage = m_xExtensionManager->addExtension( sSourceDir, uno::Sequence<beans::NamedValue>(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), xAbortChannel, xCmdEnv ); @@ -518,7 +518,7 @@ void TmpRepositoryCommandEnv::handle( { uno::Any request( xRequest->getRequest() ); OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); - + bool approve = true; bool abort = false; @@ -542,7 +542,7 @@ void TmpRepositoryCommandEnv::handle( else if (abort) { uno::Reference< task::XInteractionAbort > xInteractionAbort( pConts[ pos ], uno::UNO_QUERY ); - if (xInteractionAbort.is()) { + if (xInteractionAbort.is()) { xInteractionAbort->select(); // don't query again for ongoing continuations: abort = false; @@ -581,6 +581,6 @@ Reference< XInterface > SAL_CALL OO3ExtensionMigration_create( // ----------------------------------------------------------------------------- -} // namespace migration +} // namespace migration /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index adadb3b293e6..0843707fb660 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -155,7 +155,7 @@ namespace migration }; //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... #endif // _DESKTOP_OO3EXTENSIONMIGRATION_HXX_ diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 55576423fe92..152cded83c9b 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -153,14 +153,14 @@ namespace migration { return aResult; } - } + } #define MAX_HEADER_LENGTH 16 bool IsUserWordbook( const ::rtl::OUString& rFile ) { - static const sal_Char* pVerStr2 = "WBSWG2"; - static const sal_Char* pVerStr5 = "WBSWG5"; - static const sal_Char* pVerStr6 = "WBSWG6"; + static const sal_Char* pVerStr2 = "WBSWG2"; + static const sal_Char* pVerStr5 = "WBSWG5"; + static const sal_Char* pVerStr6 = "WBSWG6"; static const sal_Char* pVerOOo7 = "OOoUserDict1"; bool bRet = false; @@ -169,7 +169,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) { sal_Size nSniffPos = pStream->Tell(); static sal_Size nVerOOo7Len = sal::static_int_cast< sal_Size >(strlen( pVerOOo7 )); - sal_Char pMagicHeader[MAX_HEADER_LENGTH]; + sal_Char pMagicHeader[MAX_HEADER_LENGTH]; pMagicHeader[ nVerOOo7Len ] = '\0'; if ((pStream->Read((void *) pMagicHeader, nVerOOo7Len) == nVerOOo7Len)) { @@ -184,8 +184,8 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) { pStream->Read(pMagicHeader, nLen); pMagicHeader[nLen] = '\0'; - if ( !strcmp(pMagicHeader, pVerStr2) - || !strcmp(pMagicHeader, pVerStr5) + if ( !strcmp(pMagicHeader, pVerStr2) + || !strcmp(pMagicHeader, pVerStr5) || !strcmp(pMagicHeader, pVerStr6) ) bRet = true; } @@ -210,14 +210,14 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) TStringVectorPtr aFileList = getFiles( m_sSourceDir ); TStringVector::const_iterator aI = aFileList->begin(); while ( aI != aFileList->end() ) - { + { if (IsUserWordbook(*aI) ) { ::rtl::OUString sSourceLocalName = aI->copy( m_sSourceDir.getLength() ); ::rtl::OUString sTargetName = sTargetDir + sSourceLocalName; INetURLObject aURL( sTargetName ); aURL.removeSegment(); - checkAndCreateDirectory( aURL ); + checkAndCreateDirectory( aURL ); ::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName ); if ( aResult != ::osl::FileBase::E_None ) { @@ -229,7 +229,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) } ++aI; } - } + } else { OSL_ENSURE( sal_False, "WordbookMigration::copyFiles: no user installation!" ); @@ -319,7 +319,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) // ----------------------------------------------------------------------------- //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index 72077e16b657..8b04417dbaf7 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -86,18 +86,18 @@ namespace migration throw (::com::sun::star::uno::RuntimeException); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XJob virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... #endif // _DESKTOP_AUTOCORRMIGRATION_HXX_ |