mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic: remove over-engineered XEnumeration service

Browse Source 
... that was causing duplicate WeakImplHelper symbols now.

Change-Id: Ibbf84a2059f30bfeb5c265adcafb4b56d2534dc8
This commit is contained in:
Michael Stahl
2015-09-03 13:54:47 +02:00
parent 6eff03b7d8
commit 3fb50fbe2b
2 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
basic/source/basmgr/vbahelper.cxx
View File

@@ -28,7 +28,6 @@
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase.hxx>
#include <rtl/instance.hxx>
namespace basic {
@@ -48,24 +47,12 @@ uno::Reference< frame::XModuleManager2 > lclCreateModuleManager()
return frame::ModuleManager::create(xContext);
}
typedef ::std::vector<uno::Reference<frame::XModel>> ModelVector;
/** Implementation of an enumeration of all open documents of the same type.
*/
class DocumentsEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration >
{
public:
explicit DocumentsEnumeration( const uno::Reference< frame::XModel >& rxModel );
virtual sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
typedef ::std::vector< uno::Reference< frame::XModel > > ModelVector;
ModelVector maModels;
ModelVector::iterator maModelIt;
};
DocumentsEnumeration::DocumentsEnumeration( const uno::Reference< frame::XModel >& rxModel )
static ModelVector CreateDocumentsEnumeration(
const uno::Reference< frame::XModel >& rxModel)
{
ModelVector models;
try
{
uno::Reference< frame::XModuleManager2 > xModuleManager( lclCreateModuleManager() );
@@ -77,29 +64,15 @@ DocumentsEnumeration::DocumentsEnumeration( const uno::Reference< frame::XModel
{
uno::Reference< frame::XModel > xCurrModel( xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
if( xModuleManager->identify( xCurrModel ) == aIdentifier )
maModels.push_back( xCurrModel );
models.push_back( xCurrModel );
}
}
catch(const uno::Exception& )
{
}
maModelIt = maModels.begin();
return models;
}
sal_Bool SAL_CALL DocumentsEnumeration::hasMoreElements() throw (uno::RuntimeException, std::exception)
{
return maModelIt != maModels.end();
}
uno::Any SAL_CALL DocumentsEnumeration::nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
if( maModelIt == maModels.end() )
throw container::NoSuchElementException();
return uno::Any( *maModelIt++ );
}
/** Locks or unlocks the controllers of the specified document model.
*/
void lclLockControllers( const uno::Reference< frame::XModel >& rxModel, bool bLockControllers )
@@ -156,15 +129,17 @@ typedef void (*ModifyDocumentFunc)( const uno::Reference< frame::XModel >&, bool
*/
void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Reference< frame::XModel >& rxModel, bool bModificator )
{
uno::Reference< container::XEnumeration > xDocumentsEnum( new DocumentsEnumeration( rxModel ) );
ModelVector models(CreateDocumentsEnumeration(rxModel));
// iterate over all open documents
while( xDocumentsEnum->hasMoreElements() ) try
{
uno::Reference< frame::XModel > xCurrModel( xDocumentsEnum->nextElement(), uno::UNO_QUERY_THROW );
pModifyDocumentFunc( xCurrModel, bModificator );
}
catch(const uno::Exception& )
for (auto const& xCurrModel : models)
{
try
{
pModifyDocumentFunc(xCurrModel, bModificator);
}
catch (const uno::Exception&)
{
}
}
}

1
include/basic/vbahelper.hxx
View File

@@ -20,7 +20,6 @@
#ifndef INCLUDED_BASIC_VBAHELPER_HXX
#define INCLUDED_BASIC_VBAHELPER_HXX
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <rtl/ustring.hxx>
#include <basic/basicdllapi.h>