basic/source/sbx/sbxdec.cxx | 1 compilerplugins/clang/unusedmethods.py | 2 - desktop/source/deployment/dp_persmap.cxx | 6 +-- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 18 +++------- desktop/source/deployment/gui/dp_gui_dialog2.hxx | 8 ++-- desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 9 ++--- desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 2 - desktop/source/deployment/inc/dp_persmap.h | 2 - desktop/source/deployment/registry/component/dp_component.cxx | 12 ++---- desktop/source/deployment/registry/configuration/dp_configuration.cxx | 7 +-- desktop/source/migration/services/basicmigration.cxx | 8 +--- desktop/source/migration/services/basicmigration.hxx | 2 - desktop/source/migration/services/oo3extensionmigration.cxx | 8 +--- desktop/source/migration/services/oo3extensionmigration.hxx | 2 - desktop/source/migration/services/wordbookmigration.cxx | 8 +--- desktop/source/migration/services/wordbookmigration.hxx | 2 - editeng/source/editeng/editdoc.cxx | 13 ------- editeng/source/editeng/editdoc.hxx | 2 - editeng/source/editeng/impedit.hxx | 2 - editeng/source/editeng/impedit2.cxx | 4 -- editeng/source/editeng/textconv.cxx | 3 - editeng/source/editeng/textconv.hxx | 2 - extensions/source/abpilot/datasourcehandling.cxx | 3 - extensions/source/abpilot/datasourcehandling.hxx | 2 - extensions/source/propctrlr/pcrcommon.hxx | 3 - extensions/source/propctrlr/propertyeditor.cxx | 8 +--- extensions/source/propctrlr/propertyeditor.hxx | 2 - extensions/source/propctrlr/standardcontrol.cxx | 4 -- extensions/source/propctrlr/standardcontrol.hxx | 2 - extensions/source/propctrlr/unourl.hxx | 3 - extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 7 +-- extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx | 2 - 32 files changed, 53 insertions(+), 106 deletions(-)
New commits: commit 9a64d7f8ddbd27020c1e9eb3866efbfaa62c8be5 Author: Noel Grandin <[email protected]> Date: Mon Jan 11 11:54:23 2016 +0200 fix windows build Change-Id: Ie00d2dd3fbf6ff498c652249797f8d01acef8a97 diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index 8938e2f..8a956c8 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -387,7 +387,6 @@ void SbxDecimal::getString( OUString& rString ) SysFreeString( aBStr ); } - return bRet; #else (void)rString; #endif commit 1ea49b5baeb415038129b4f1e0b5a331b32365d5 Author: Noel Grandin <[email protected]> Date: Mon Jan 11 11:54:13 2016 +0200 loplugin:unusedmethods unused return value in extensions Change-Id: I449ecdb734e796813384a5d015e9ecabe28079eb diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index baf72de..fddb247 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2940,19 +2940,6 @@ bool CharAttribList::HasBoundingAttrib( sal_Int32 nBound ) const return false; } -const EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) const -{ - if ( !bHasEmptyAttribs ) - return nullptr; - - for (const std::unique_ptr<EditCharAttrib>& rAttr : aAttribs) - { - if (rAttr->GetStart() == nPos && rAttr->GetEnd() == nPos && rAttr->Which() == nWhich) - return rAttr.get(); - } - return nullptr; -} - EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) { if ( !bHasEmptyAttribs ) diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index ebdfb09..9fca927 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -201,7 +201,6 @@ public: const EditCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) const; EditCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos ); const EditCharAttrib* FindNextAttrib( sal_uInt16 nWhich, sal_Int32 nFromPos ) const; - const EditCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) const; EditCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ); const EditCharAttrib* FindFeature( sal_Int32 nPos ) const; @@ -262,7 +261,6 @@ public: void SetStyleSheet( SfxStyleSheet* pS, bool bRecalcFont = true ); void SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyle ); SfxStyleSheet* GetStyleSheet() { return aContentAttribs.GetStyleSheet(); } - const SfxStyleSheet* GetStyleSheet() const { return aContentAttribs.GetStyleSheet(); } void CreateDefFont(); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index e1da8ca..c8d2211 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -548,7 +548,7 @@ private: void CheckPageOverflow(); - EditPaM Clear(); + void Clear(); EditPaM RemoveText(); bool CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ); void CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 nStartPosY ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 97ea393..1aa89c4 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -611,7 +611,7 @@ EditPaM ImpEditEngine::InsertText(const EditSelection& aSel, const OUString& rSt return aPaM; } -EditPaM ImpEditEngine::Clear() +void ImpEditEngine::Clear() { InitDoc( false ); @@ -628,8 +628,6 @@ EditPaM ImpEditEngine::Clear() EditView* pView = aEditViews[--nView]; pView->pImpEditView->SetEditSelection( aSel ); } - - return aPaM; } EditPaM ImpEditEngine::RemoveText() diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 5491fbe..7807714 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -116,7 +116,7 @@ bool TextConvWrapper::ConvNext_impl() } -bool TextConvWrapper::FindConvText_impl() +void TextConvWrapper::FindConvText_impl() { // modified version of SvxSpellWrapper::FindSpellError @@ -138,7 +138,6 @@ bool TextConvWrapper::FindConvText_impl() } } m_pWin->LeaveWait(); - return bFound; } diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx index ca66666..e7209fc 100644 --- a/editeng/source/editeng/textconv.hxx +++ b/editeng/source/editeng/textconv.hxx @@ -52,7 +52,7 @@ class TextConvWrapper : public editeng::HangulHanjaConversion // from SvxSpellWrapper copied and modified bool ConvNext_impl(); // former SpellNext - bool FindConvText_impl(); // former FindSpellError + void FindConvText_impl(); // former FindSpellError bool ConvMore_impl(); // former SpellMore // from EditSpellWrapper copied and modified diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 6ede832..382a397 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -222,7 +222,7 @@ namespace abp } - OUString& ODataSourceContext::disambiguate(OUString& _rDataSourceName) + void ODataSourceContext::disambiguate(OUString& _rDataSourceName) { OUString sCheck( _rDataSourceName ); StringBag::const_iterator aPos = m_pImpl->aDataSourceNames.find( sCheck ); @@ -237,7 +237,6 @@ namespace abp } _rDataSourceName = sCheck; - return _rDataSourceName; } diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 230d1bf..96fed75 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -58,7 +58,7 @@ namespace abp void getDataSourceNames( StringBag& _rNames ) const; /// disambiguates the given name by appending successive numbers - OUString& disambiguate(OUString& _rDataSourceName); + void disambiguate(OUString& _rDataSourceName); /// creates a new MORK data source ODataSource createNewMORK( const OUString& _rName ); diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 17d268a..2aec531 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -86,9 +86,6 @@ namespace pcr inline StlSyntaxSequence( const ELEMENT* pElements, sal_Int32 len ) : UnoBase( pElements, len ) { } explicit inline StlSyntaxSequence( sal_Int32 len ) : UnoBase( len ) { } - operator const UnoBase&() const { return *this; } - operator UnoBase&() { return *this; } - typedef const ELEMENT* const_iterator; typedef ELEMENT* iterator; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 83278bd..095fd32 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -391,21 +391,19 @@ namespace pcr } - sal_uInt16 OPropertyEditor::InsertEntry( const OLineDescriptor& rData, sal_uInt16 _nPageId, sal_uInt16 nPos ) + void OPropertyEditor::InsertEntry( const OLineDescriptor& rData, sal_uInt16 _nPageId, sal_uInt16 nPos ) { // let the current page handle this OBrowserPage* pPage = getPage( _nPageId ); DBG_ASSERT( pPage, "OPropertyEditor::InsertEntry: don't have such a page!" ); if ( !pPage ) - return EDITOR_LIST_ENTRY_NOTFOUND; + return; - sal_uInt16 nEntry = pPage->getListBox().InsertEntry( rData, nPos ); + pPage->getListBox().InsertEntry( rData, nPos ); OSL_ENSURE( m_aPropertyPageIds.find( rData.sName ) == m_aPropertyPageIds.end(), "OPropertyEditor::InsertEntry: property already present in the map!" ); m_aPropertyPageIds.insert( MapStringToPageId::value_type( rData.sName, _nPageId ) ); - - return nEntry; } diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index a57c526..3a9bf85 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -102,7 +102,7 @@ namespace pcr void ShowPropertyPage( sal_uInt16 _nPageId, bool _bShow ); - sal_uInt16 InsertEntry( const OLineDescriptor&, sal_uInt16 _nPageId, sal_uInt16 nPos = EDITOR_LIST_APPEND ); + void InsertEntry( const OLineDescriptor&, sal_uInt16 _nPageId, sal_uInt16 nPos = EDITOR_LIST_APPEND ); void RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor& ); diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 00138e5..38b136c 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -1205,7 +1205,7 @@ namespace pcr #define STD_HEIGHT 100 - bool DropDownEditControl::ShowDropDown( bool bShow ) + void DropDownEditControl::ShowDropDown( bool bShow ) { if (bShow) { @@ -1241,8 +1241,6 @@ namespace pcr m_bDropdown = false; m_pImplEdit->GrabFocus(); } - return m_bDropdown; - } diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index f5422f0..c3c83e28 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -391,7 +391,7 @@ namespace pcr DECL_LINK_TYPED( ReturnHdl, FloatingWindow*, void ); DECL_LINK_TYPED( DropDownHdl, Button*, void ); - bool ShowDropDown( bool bShow ); + void ShowDropDown( bool bShow ); }; diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx index 9d32c94..5dccb7a 100644 --- a/extensions/source/propctrlr/unourl.hxx +++ b/extensions/source/propctrlr/unourl.hxx @@ -42,8 +42,7 @@ namespace pcr const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB ); - inline operator const OUString& () const { return m_aURL.Complete; } - inline operator const css::util::URL& () const { return m_aURL; } + inline operator const css::util::URL& () const { return m_aURL; } private: UnoURL(); // never implemented diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index f5cb77f..55bc534 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -498,19 +498,18 @@ namespace pcr } - bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName ) + void XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName ) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoCloneCurrentDataType: this will crash!" ); ::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType(); if ( !pType.is() ) - return false; + return; if ( !m_pHelper->cloneDataType( pType, _rNewName ) ) - return false; + return; m_pHelper->setValidatingDataTypeByName( _rNewName ); - return true; } diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index 204f452..e4f2464 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -77,7 +77,7 @@ namespace pcr bool implDoRemoveCurrentDataType(); bool implPrepareCloneDataCurrentType( OUString& _rNewName ); - bool implDoCloneCurrentDataType( const OUString& _rNewName ); + void implDoCloneCurrentDataType( const OUString& _rNewName ); /** retrieves the names of the data types which our introspectee can be validated against */ commit a3f3cead5d7fed99ea78c2a12b8671f18d156e23 Author: Noel Grandin <[email protected]> Date: Mon Jan 11 11:22:46 2016 +0200 loplugin: unused return values in desktop Change-Id: Iec7a150c6bdb3b25fe24d711e3e453e1d8a5d26e diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py index aca8591..4834427 100755 --- a/compilerplugins/clang/unusedmethods.py +++ b/compilerplugins/clang/unusedmethods.py @@ -255,7 +255,7 @@ for d in definitionSet: if d[0] == "void": continue # ignore UNO constructor method entrypoints - if "_get_implementation" in d[1]: + if "_get_implementation" in d[1] or "_getFactory" in d[1]: continue # the plugin can't see calls to these if "operator new" in d[1]: diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index 94a48c3..010c0f5 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.cxx @@ -138,7 +138,7 @@ static OString decodeString( const sal_Char* pEncChars, int nLen) return aDecStr.makeStringAndClear(); } -bool PersistentMap::open() +void PersistentMap::open() { // open the existing file sal_uInt32 nOpenFlags = osl_File_OpenFlag_Read; @@ -152,9 +152,9 @@ bool PersistentMap::open() m_bToBeCreated &= (rcOpen == osl::File::E_NOENT) && !m_bIsOpen; if( !m_bIsOpen) - return m_bToBeCreated; + return; - return readAll(); + readAll(); } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 70c8eed..e25a28e 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -747,7 +747,7 @@ void ExtMgrDialog::setGetExtensionsURL( const OUString &rURL ) } -long ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage, +void ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage, bool bLicenseMissing ) { @@ -758,20 +758,19 @@ long ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage if (m_pBundledCbx->IsChecked() && (xPackage->getRepositoryName() == BUNDLED_PACKAGE_MANAGER) ) { - return m_pExtensionBox->addEntry( xPackage, bLicenseMissing ); + m_pExtensionBox->addEntry( xPackage, bLicenseMissing ); } else if (m_pSharedCbx->IsChecked() && (xPackage->getRepositoryName() == SHARED_PACKAGE_MANAGER) ) { - return m_pExtensionBox->addEntry( xPackage, bLicenseMissing ); + m_pExtensionBox->addEntry( xPackage, bLicenseMissing ); } else if (m_pUserCbx->IsChecked() && (xPackage->getRepositoryName() == USER_PACKAGE_MANAGER )) { - return m_pExtensionBox->addEntry( xPackage, bLicenseMissing ); + m_pExtensionBox->addEntry( xPackage, bLicenseMissing ); } else { //OSL_FAIL("Package will not be displayed"); - return 0; } } @@ -1221,7 +1220,7 @@ void UpdateRequiredDialog::dispose() ModalDialog::dispose(); } -long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage, +void UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage, bool bLicenseMissing ) { // We will only add entries to the list with unsatisfied dependencies @@ -1230,9 +1229,8 @@ long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::X m_bHasLockedEntries |= m_pManager->isReadOnly( xPackage ); const SolarMutexGuard aGuard; m_pUpdateBtn->Enable(); - return m_pExtensionBox->addEntry( xPackage ); + m_pExtensionBox->addEntry( xPackage ); } - return 0; } @@ -1255,12 +1253,10 @@ void UpdateRequiredDialog::checkEntries() } -bool UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPackage > &xPackage, +void UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPackage > &xPackage, bool bEnable ) { m_pManager->getCmdQueue()->enableExtension( xPackage, bEnable ); - - return true; } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 55d0ece..4fd0035 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -77,7 +77,7 @@ public: virtual void updateProgress( const long nProgress ) = 0; virtual void updatePackageInfo( const css::uno::Reference< css::deployment::XPackage > &xPackage ) = 0; - virtual long addPackageToList( const css::uno::Reference< css::deployment::XPackage > &xPackage, + virtual void addPackageToList( const css::uno::Reference< css::deployment::XPackage > &xPackage, bool bLicenseMissing = false ) = 0; virtual void prepareChecking() = 0; @@ -156,7 +156,7 @@ public: virtual void updatePackageInfo( const css::uno::Reference< css::deployment::XPackage > &xPackage ) override; void setGetExtensionsURL( const OUString &rURL ); - virtual long addPackageToList( const css::uno::Reference< css::deployment::XPackage > &, + virtual void addPackageToList( const css::uno::Reference< css::deployment::XPackage > &, bool bLicenseMissing = false ) override; bool enablePackage(const css::uno::Reference< css::deployment::XPackage > &xPackage, bool bEnable ); @@ -224,9 +224,9 @@ public: virtual void updatePackageInfo( const css::uno::Reference< css::deployment::XPackage > &xPackage ) override; - virtual long addPackageToList( const css::uno::Reference< css::deployment::XPackage > &, + virtual void addPackageToList( const css::uno::Reference< css::deployment::XPackage > &, bool bLicenseMissing = false ) override; - bool enablePackage( const css::uno::Reference< css::deployment::XPackage > &xPackage, bool bEnable ); + void enablePackage( const css::uno::Reference< css::deployment::XPackage > &xPackage, bool bEnable ); virtual void prepareChecking() override; virtual void checkEntries() override; diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 99bbeae..e739a38 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -189,7 +189,7 @@ bool TheExtensionManager::isVisible() } -bool TheExtensionManager::checkUpdates( bool /* bShowUpdateOnly */, bool /*bParentVisible*/ ) +void TheExtensionManager::checkUpdates( bool /* bShowUpdateOnly */, bool /*bParentVisible*/ ) { std::vector< uno::Reference< deployment::XPackage > > vEntries; uno::Sequence< uno::Sequence< uno::Reference< deployment::XPackage > > > xAllPackages; @@ -198,11 +198,11 @@ bool TheExtensionManager::checkUpdates( bool /* bShowUpdateOnly */, bool /*bPare xAllPackages = m_xExtensionManager->getAllExtensions( uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment >() ); } catch ( const deployment::DeploymentException & ) { - return false; + return; } catch ( const ucb::CommandFailedException & ) { - return false; + return; } catch ( const ucb::CommandAbortedException & ) { - return false; + return; } catch ( const lang::IllegalArgumentException & e ) { throw uno::RuntimeException( e.Message, e.Context ); } @@ -218,7 +218,6 @@ bool TheExtensionManager::checkUpdates( bool /* bShowUpdateOnly */, bool /*bPare } m_pExecuteCmdQueue->checkForUpdates( vEntries ); - return true; } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index c68987f..263fe20 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -90,7 +90,7 @@ public: bool isVisible(); - bool checkUpdates( bool showUpdateOnly, bool parentVisible ); + void checkUpdates( bool showUpdateOnly, bool parentVisible ); bool installPackage( const OUString &rPackageURL, bool bWarnUser = false ); void createPackageList(); diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index 4f97994..c18b2c8 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -54,7 +54,7 @@ public: bool erase( OString const & key, bool flush_immediately = true ); protected: - bool open(); + void open(); bool readAll(); void add( OString const & key, OString const & value ); void flush(); diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index b591ec3..b52b0df 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -310,9 +310,9 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend OUString const & id, Reference<XInterface> const & xObject ); void releaseObject( OUString const & id ); - bool addToUnoRc( RcItem kind, OUString const & url, + void addToUnoRc( RcItem kind, OUString const & url, Reference<XCommandEnvironment> const & xCmdEnv ); - bool removeFromUnoRc( RcItem kind, OUString const & url, + void removeFromUnoRc( RcItem kind, OUString const & url, Reference<XCommandEnvironment> const & xCmdEnv ); bool hasInUnoRc( RcItem kind, OUString const & url ); @@ -992,7 +992,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) } -bool BackendImpl::addToUnoRc( RcItem kind, OUString const & url_, +void BackendImpl::addToUnoRc( RcItem kind, OUString const & url_, Reference<XCommandEnvironment> const & xCmdEnv ) { const OUString rcterm( dp_misc::makeRcTerm(url_) ); @@ -1004,14 +1004,11 @@ bool BackendImpl::addToUnoRc( RcItem kind, OUString const & url_, // write immediately: m_unorc_modified = true; unorc_flush( xCmdEnv ); - return true; } - else - return false; } -bool BackendImpl::removeFromUnoRc( +void BackendImpl::removeFromUnoRc( RcItem kind, OUString const & url_, Reference<XCommandEnvironment> const & xCmdEnv ) { @@ -1022,7 +1019,6 @@ bool BackendImpl::removeFromUnoRc( // write immediately: m_unorc_modified = true; unorc_flush( xCmdEnv ); - return true; } diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 3df952a..4dc4f8d 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -131,7 +131,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend value from the backend db. This entry already contains the path as it is used in the configmgr.ini. */ - bool addToConfigmgrIni( bool isSchema, bool isURL, OUString const & url, + void addToConfigmgrIni( bool isSchema, bool isURL, OUString const & url, Reference<XCommandEnvironment> const & xCmdEnv ); bool removeFromConfigmgrIni( bool isSchema, OUString const & url, Reference<XCommandEnvironment> const & xCmdEnv ); @@ -471,7 +471,7 @@ void BackendImpl::configmgrini_flush( } -bool BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const & url_, +void BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const & url_, Reference<XCommandEnvironment> const & xCmdEnv ) { const OUString rcterm( isURL ? dp_misc::makeRcTerm(url_) : url_ ); @@ -483,10 +483,7 @@ bool BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const & // write immediately: m_configmgrini_modified = true; configmgrini_flush( xCmdEnv ); - return true; } - else - return false; } diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index 457b479..26b0ca3 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -106,7 +106,7 @@ namespace migration - ::osl::FileBase::RC BasicMigration::checkAndCreateDirectory( INetURLObject& rDirURL ) + void BasicMigration::checkAndCreateDirectory( INetURLObject& rDirURL ) { ::osl::FileBase::RC aResult = ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); if ( aResult == ::osl::FileBase::E_NOENT ) @@ -114,11 +114,7 @@ namespace migration INetURLObject aBaseURL( rDirURL ); aBaseURL.removeSegment(); checkAndCreateDirectory( aBaseURL ); - return ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); - } - else - { - return aResult; + ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); } } diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index 7b2657c..02600c1 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -60,7 +60,7 @@ namespace migration OUString m_sSourceDir; TStringVectorPtr getFiles( const OUString& rBaseURL ) const; - ::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL ); + void checkAndCreateDirectory( INetURLObject& rDirURL ); void copyFiles(); public: diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index f2c1620..e1e0f38 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -80,7 +80,7 @@ OO3ExtensionMigration::~OO3ExtensionMigration() { } -::osl::FileBase::RC OO3ExtensionMigration::checkAndCreateDirectory( INetURLObject& rDirURL ) +void OO3ExtensionMigration::checkAndCreateDirectory( INetURLObject& rDirURL ) { ::osl::FileBase::RC aResult = ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); if ( aResult == ::osl::FileBase::E_NOENT ) @@ -88,11 +88,7 @@ OO3ExtensionMigration::~OO3ExtensionMigration() INetURLObject aBaseURL( rDirURL ); aBaseURL.removeSegment(); checkAndCreateDirectory( aBaseURL ); - return ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); - } - else - { - return aResult; + ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); } } diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index 79aebdd..b049c16 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -79,7 +79,7 @@ namespace migration SCANRESULT_DONTMIGRATE_EXTENSION }; - ::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL ); + void checkAndCreateDirectory( INetURLObject& rDirURL ); ScanResult scanExtensionFolder( const OUString& sExtFolder ); void scanUserExtensions( const OUString& sSourceDir, TStringVector& aMigrateExtensions ); bool scanDescriptionXml( const OUString& sDescriptionXmlFilePath ); diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index b289ee5..621b65e 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -106,7 +106,7 @@ namespace migration - ::osl::FileBase::RC WordbookMigration::checkAndCreateDirectory( INetURLObject& rDirURL ) + void WordbookMigration::checkAndCreateDirectory( INetURLObject& rDirURL ) { ::osl::FileBase::RC aResult = ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); if ( aResult == ::osl::FileBase::E_NOENT ) @@ -114,11 +114,7 @@ namespace migration INetURLObject aBaseURL( rDirURL ); aBaseURL.removeSegment(); checkAndCreateDirectory( aBaseURL ); - return ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); - } - else - { - return aResult; + ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); } } diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index 8982c76..49c997c 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -60,7 +60,7 @@ namespace migration OUString m_sSourceDir; TStringVectorPtr getFiles( const OUString& rBaseURL ) const; - ::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL ); + void checkAndCreateDirectory( INetURLObject& rDirURL ); void copyFiles(); public: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
