summaryrefslogtreecommitdiff
path: root/sc/source/ui/vba
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/vba')
-rw-r--r--sc/source/ui/vba/vbafiledialog.cxx2
-rw-r--r--sc/source/ui/vba/vbafiledialogitems.cxx8
-rw-r--r--sc/source/ui/vba/vbafiledialogitems.hxx4
-rw-r--r--sc/source/ui/vba/vbawindow.cxx5
-rw-r--r--sc/source/ui/vba/vbawindows.cxx5
-rw-r--r--sc/source/ui/vba/vbaworksheets.cxx8
6 files changed, 18 insertions, 14 deletions
diff --git a/sc/source/ui/vba/vbafiledialog.cxx b/sc/source/ui/vba/vbafiledialog.cxx
index 6f523c8c1d72..1aa4e77e83ea 100644
--- a/sc/source/ui/vba/vbafiledialog.cxx
+++ b/sc/source/ui/vba/vbafiledialog.cxx
@@ -139,7 +139,7 @@ sal_Int32 ScVbaFileDialog::Show()
}
m_xItems = css::uno::Reference< ov::excel::XFileDialogSelectedItems >(
- new ScVbaFileDialogSelectedItems(this, mxContext, sSelectedPaths) );
+ new ScVbaFileDialogSelectedItems(this, mxContext, std::move(sSelectedPaths)) );
return nRet;
}
diff --git a/sc/source/ui/vba/vbafiledialogitems.cxx b/sc/source/ui/vba/vbafiledialogitems.cxx
index 14c7853ee178..20ca30e3bf89 100644
--- a/sc/source/ui/vba/vbafiledialogitems.cxx
+++ b/sc/source/ui/vba/vbafiledialogitems.cxx
@@ -28,7 +28,7 @@ class FileDialogItemEnumeration : public ::cppu::WeakImplHelper< container::XEnu
std::vector< OUString > m_sItems;
std::vector< OUString >::iterator mIt;
public:
- explicit FileDialogItemEnumeration( const std::vector< OUString >& rVector ) : m_sItems( rVector ), mIt( m_sItems.begin() ) {}
+ explicit FileDialogItemEnumeration( std::vector< OUString >&& rVector ) : m_sItems( std::move(rVector) ), mIt( m_sItems.begin() ) {}
virtual sal_Bool SAL_CALL hasMoreElements() override
{
return ( mIt != m_sItems.end() );
@@ -47,9 +47,9 @@ public:
ScVbaFileDialogSelectedItems::ScVbaFileDialogSelectedItems(
const css::uno::Reference< ov::XHelperInterface >& xParent
,const css::uno::Reference< css::uno::XComponentContext >& xContext
- ,const std::vector< OUString >& rItems)
+ ,std::vector< OUString >&& rItems)
: FileDialogSelectedItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() )
- , m_sItems(rItems) {}
+ , m_sItems(std::move(rItems)) {}
// XEnumerationAccess
@@ -62,7 +62,7 @@ ScVbaFileDialogSelectedItems::getElementType()
uno::Reference< container::XEnumeration >
ScVbaFileDialogSelectedItems::createEnumeration()
{
- return uno::Reference< container::XEnumeration >( new FileDialogItemEnumeration( m_sItems ) );
+ return uno::Reference< container::XEnumeration >( new FileDialogItemEnumeration( std::vector(m_sItems) ) );
}
uno::Any
diff --git a/sc/source/ui/vba/vbafiledialogitems.hxx b/sc/source/ui/vba/vbafiledialogitems.hxx
index fa56fde53a7f..7a656237359b 100644
--- a/sc/source/ui/vba/vbafiledialogitems.hxx
+++ b/sc/source/ui/vba/vbafiledialogitems.hxx
@@ -17,7 +17,9 @@ class ScVbaFileDialogSelectedItems final : public FileDialogSelectedItems_BASE
{
const std::vector<OUString> m_sItems;
public:
- ScVbaFileDialogSelectedItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const std::vector<OUString>& sItems);
+ ScVbaFileDialogSelectedItems( const css::uno::Reference< ov::XHelperInterface >& xParent,
+ const css::uno::Reference< css::uno::XComponentContext >& xContext,
+ std::vector<OUString>&& sItems);
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() override;
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 1691fbbc3bf3..f43775f1fc88 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -72,7 +72,8 @@ public:
Sheets::const_iterator m_it;
/// @throws uno::RuntimeException
- SelectedSheetsEnum( const uno::Reference< uno::XComponentContext >& xContext, const Sheets& sheets, const uno::Reference< frame::XModel >& xModel ) : m_xContext( xContext ), m_sheets( sheets ), m_xModel( xModel )
+ SelectedSheetsEnum( const uno::Reference< uno::XComponentContext >& xContext, Sheets&& sheets, const uno::Reference< frame::XModel >& xModel )
+ : m_xContext( xContext ), m_sheets( std::move(sheets) ), m_xModel( xModel )
{
m_it = m_sheets.begin();
}
@@ -133,7 +134,7 @@ public:
//XEnumerationAccess
virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override
{
- return new SelectedSheetsEnum( m_xContext, sheets, m_xModel );
+ return new SelectedSheetsEnum( m_xContext, std::vector(sheets), m_xModel );
}
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) override
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index 45f215eea41d..9108913df41b 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -65,7 +65,8 @@ protected:
public:
/// @throws uno::RuntimeException
- WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Components& components ) : m_xContext( xContext ), m_components( components )
+ WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, Components&& components )
+ : m_xContext( xContext ), m_components( std::move(components) )
{
m_it = m_components.begin();
}
@@ -151,7 +152,7 @@ public:
//XEnumerationAccess
virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override
{
- return new WindowComponentEnumImpl( m_xContext, m_windows );
+ return new WindowComponentEnumImpl( m_xContext, std::vector(m_windows) );
}
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) override
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index d1acee975d3c..f1231cabf4ea 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -56,7 +56,7 @@ class WorkSheetsEnumeration : public ::cppu::WeakImplHelper< container::XEnumera
SheetMap mSheetMap;
SheetMap::iterator mIt;
public:
- explicit WorkSheetsEnumeration( const SheetMap& sMap ) : mSheetMap( sMap ), mIt( mSheetMap.begin() ) {}
+ explicit WorkSheetsEnumeration( SheetMap&& sMap ) : mSheetMap( std::move(sMap) ), mIt( mSheetMap.begin() ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
return ( mIt != mSheetMap.end() );
@@ -77,7 +77,7 @@ class SheetCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAcc
SheetMap mSheetMap;
SheetMap::iterator cachePos;
public:
- explicit SheetCollectionHelper( const SheetMap& sMap ) : mSheetMap( sMap ), cachePos(mSheetMap.begin()) {}
+ explicit SheetCollectionHelper( SheetMap&& sMap ) : mSheetMap( std::move(sMap) ), cachePos(mSheetMap.begin()) {}
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<sheet::XSpreadsheet>::get(); }
virtual sal_Bool SAL_CALL hasElements( ) override { return ( !mSheetMap.empty() ); }
@@ -127,7 +127,7 @@ public:
// XEnumerationAccess
virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override
{
- return new WorkSheetsEnumeration( mSheetMap );
+ return new WorkSheetsEnumeration( std::vector(mSheetMap) );
}
};
@@ -439,7 +439,7 @@ ScVbaWorksheets::Item(const uno::Any& Index, const uno::Any& Index2)
uno::Reference< container::XNamed > xName( xSheet, uno::UNO_QUERY_THROW );
aSheets.push_back( xSheet );
}
- uno::Reference< container::XIndexAccess > xIndexAccess = new SheetCollectionHelper( aSheets );
+ uno::Reference< container::XIndexAccess > xIndexAccess = new SheetCollectionHelper( std::move(aSheets) );
uno::Reference< XCollection > xSelectedSheets( new ScVbaWorksheets( getParent(), mxContext, xIndexAccess, mxModel ) );
return uno::makeAny( xSelectedSheets );
}
generated by cgit (git 2.34.1) at 2025-02-20 15:36:06 +0000