diff options
Diffstat (limited to 'sw/source/ui')
62 files changed, 290 insertions, 290 deletions
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 1a5f972869ab..26e8c9e960df 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -251,10 +251,10 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl, weld::Button&, void) xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY); uno::Reference<XPropertySet> xRowProperties(xRowSet, UNO_QUERY); xRowProperties->setPropertyValue("DataSourceName", - makeAny(m_xListLB->get_text(nSelect, 0))); - xRowProperties->setPropertyValue("Command", makeAny(sCommand)); - xRowProperties->setPropertyValue("CommandType", makeAny(pUserData->nCommandType)); - xRowProperties->setPropertyValue("ActiveConnection", makeAny(pUserData->xConnection.getTyped())); + Any(m_xListLB->get_text(nSelect, 0))); + xRowProperties->setPropertyValue("Command", Any(sCommand)); + xRowProperties->setPropertyValue("CommandType", Any(pUserData->nCommandType)); + xRowProperties->setPropertyValue("ActiveConnection", Any(pUserData->xConnection.getTyped())); xRowSet->execute(); OUString sQuery; diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 1de09d99824b..e37b9d2131ff 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -266,7 +266,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, SwAsciiFilterDlg::~SwAsciiFilterDlg() { SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); - aDlgOpt.SetUserItem("UserItem", uno::makeAny(m_sExtraData)); + aDlgOpt.SetUserItem("UserItem", uno::Any(m_sExtraData)); } void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index b2ef183d7b2c..a3386f333398 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -198,7 +198,7 @@ SfxTabPage* SwFieldEditDlg::CreatePage(sal_uInt16 nGroup) uno::Reference< beans::XPropertySet > xUDProps( xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW); - pSet->Put( SfxUnoAnyItem( FN_FIELD_DIALOG_DOC_PROPS, uno::makeAny(xUDProps) ) ); + pSet->Put( SfxUnoAnyItem( FN_FIELD_DIALOG_DOC_PROPS, uno::Any(xUDProps) ) ); xTabPage = SwFieldDokInfPage::Create(get_content_area(), this, pSet); break; } diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 24cc745e4007..53e5a51c6eaf 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -147,7 +147,7 @@ SfxItemSet* SwFieldDlg::CreateInputItemSet(const OString& rID) uno::Reference< beans::XPropertySet > xUDProps( xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW); - mxInputItemSet->Put( SfxUnoAnyItem( FN_FIELD_DIALOG_DOC_PROPS, uno::makeAny(xUDProps) ) ); + mxInputItemSet->Put( SfxUnoAnyItem( FN_FIELD_DIALOG_DOC_PROPS, uno::Any(xUDProps) ) ); return mxInputItemSet.get(); } else diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 134785415221..5ce1d903cea4 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -194,7 +194,7 @@ void SwFrameDlg::PageCreated(const OString& rId, SfxTabPage &rPage) { sal_Int32 nPreferredDPI = m_pWrtShell->GetDoc()->getIDocumentSettingAccess().getImagePreferredDPI(); if (nPreferredDPI) - rPage.getAdditionalProperties().emplace("PreferredDPI", css::uno::makeAny(nPreferredDPI)); + rPage.getAdditionalProperties().emplace("PreferredDPI", css::uno::Any(nPreferredDPI)); } } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index ebcfec09a14d..a0f8ab67cea7 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2521,7 +2521,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl, weld::Button&, void) m_xGrfDlg->SetDisplayDirectory(m_xConnectED->get_text()); uno::Reference < ui::dialogs::XFilePicker3 > xFP = m_xGrfDlg->GetFilePicker(); uno::Reference < ui::dialogs::XFilePickerControlAccess > xCtrlAcc(xFP, uno::UNO_QUERY); - xCtrlAcc->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, uno::makeAny(true) ); + xCtrlAcc->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, uno::Any(true) ); if ( m_xGrfDlg->Execute() != ERRCODE_NONE ) return; diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 75907a422662..8bb2dce2e226 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -80,7 +80,7 @@ static void lcl_SetBOOLProp( { if(xInfo->hasPropertyByName(aPropName)) { - xProps->setPropertyValue(aPropName, makeAny(bValue)); + xProps->setPropertyValue(aPropName, Any(bValue)); } } @@ -170,7 +170,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( uno::Reference< beans::XPropertySet > xSectPr(m_vTypeData[i].m_pxIndexSections->xContainerSection, uno::UNO_QUERY); if(xSectPr.is()) { - xSectPr->setPropertyValue(UNO_NAME_IS_VISIBLE, makeAny(i == nTOXIndex)); + xSectPr->setPropertyValue(UNO_NAME_IS_VISIBLE, Any(i == nTOXIndex)); } } // set properties diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index 0054b360e18e..0d2f2672b397 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -50,7 +50,7 @@ SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg() OUString sExtraData; m_xImplDlg->FillInfo(sExtraData); SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); - aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(sExtraData)); + aDlgOpt.SetUserItem("UserItem", css::uno::Any(sExtraData)); m_xDialog->set_modal(false); } diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 7aa61e93cef2..1cab0573121a 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -241,7 +241,7 @@ SwVbaApplication::Documents( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaDocuments( this, mxContext ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -250,7 +250,7 @@ SwVbaApplication::Addins( const uno::Any& index ) static uno::Reference< XCollection > xCol( new SwVbaAddins( this, mxContext ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -259,7 +259,7 @@ SwVbaApplication::Dialogs( const uno::Any& index ) uno::Reference< word::XDialogs > xCol( new SwVbaDialogs( this, mxContext, getCurrentDocument() )); if ( index.hasValue() ) return xCol->Item( index ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -269,7 +269,7 @@ SwVbaApplication::ListGalleries( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaListGalleries( this, mxContext, xTextDoc ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } sal_Bool SAL_CALL SwVbaApplication::getDisplayAutoCompleteTips() @@ -707,14 +707,14 @@ SwWordBasic::ToolsOptionsView( const css::uno::Any& DraftFont, css::uno::Any SAL_CALL SwWordBasic::WindowName( const css::uno::Any& /*Number*/ ) { - return css::uno::makeAny( mpApp->getActiveSwVbaWindow()->getCaption() ); + return css::uno::Any( mpApp->getActiveSwVbaWindow()->getCaption() ); } css::uno::Any SAL_CALL SwWordBasic::ExistingBookmark( const OUString& Name ) { uno::Reference< word::XBookmarks > xBookmarks( mpApp->getActiveDocument()->Bookmarks( uno::Any() ), uno::UNO_QUERY ); - return css::uno::makeAny( xBookmarks.is() && xBookmarks->Exists( Name ) ); + return css::uno::Any( xBookmarks.is() && xBookmarks->Exists( Name ) ); } void SAL_CALL @@ -742,7 +742,7 @@ SwWordBasic::AppMaximize( const css::uno::Any& WindowName, const css::uno::Any& SAL_INFO("sw.vba", "WordBasic.AppMaximize( WindowName:=" << WindowName << ", State:=" << State); // FIXME: Implement if necessary - return css::uno::makeAny( sal_Int32(0) ); + return css::uno::Any( sal_Int32(0) ); } css::uno::Any SAL_CALL @@ -751,7 +751,7 @@ SwWordBasic::DocMaximize( const css::uno::Any& State ) SAL_INFO("sw.vba", "WordBasic.DocMaximize(State:=" << State << ")"); // FIXME: Implement if necessary - return css::uno::makeAny( sal_Int32(0) ); + return css::uno::Any( sal_Int32(0) ); } void SAL_CALL @@ -768,7 +768,7 @@ SwWordBasic::AppCount() SAL_INFO("sw.vba", "WordBasic.AppCount()"); // FIXME: Implement if necessary. Return a random number for now. - return css::uno::makeAny( sal_Int32(2) ); + return css::uno::Any( sal_Int32(2) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index a45618c94ea9..018c7dbf8930 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -109,7 +109,7 @@ uno::Any SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource ) { uno::Reference< text::XAutoTextEntry > xEntry( aSource, uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XAutoTextEntry >( new SwVbaAutoTextEntry( this, mxContext, xEntry ) ) ); + return uno::Any( uno::Reference< word::XAutoTextEntry >( new SwVbaAutoTextEntry( this, mxContext, xEntry ) ) ); } OUString diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx index 4ba7030c13c6..e2a9c7b71116 100644 --- a/sw/source/ui/vba/vbabookmark.cxx +++ b/sw/source/ui/vba/vbabookmark.cxx @@ -57,7 +57,7 @@ void SAL_CALL SwVbaBookmark::Select() { checkVality(); uno::Reference< view::XSelectionSupplier > xSelectSupp( mxModel->getCurrentController(), uno::UNO_QUERY_THROW ); - xSelectSupp->select( uno::makeAny( mxBookmark ) ); + xSelectSupp->select( uno::Any( mxBookmark ) ); } OUString SAL_CALL SwVbaBookmark::getName() @@ -76,7 +76,7 @@ uno::Any SAL_CALL SwVbaBookmark::Range() uno::Reference< text::XTextContent > xTextContent( mxBookmark, uno::UNO_SET_THROW ); uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextRange > xTextRange( xTextContent->getAnchor(), uno::UNO_SET_THROW ); - return uno::makeAny( uno::Reference< word::XRange>( new SwVbaRange( this, mxContext, xTextDocument, xTextRange->getStart(), xTextRange->getEnd(), xTextRange->getText() ) ) ); + return uno::Any( uno::Reference< word::XRange>( new SwVbaRange( this, mxContext, xTextDocument, xTextRange->getStart(), xTextRange->getEnd(), xTextRange->getText() ) ) ); } OUString diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index 4da9fc1e79ca..018121291a06 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -43,7 +43,7 @@ public: { uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); OUString aName = xNamed->getName(); - return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( m_xParent, m_xContext, mxModel, aName ) ) ); + return uno::Any( uno::Reference< word::XBookmark > ( new SwVbaBookmark( m_xParent, m_xContext, mxModel, aName ) ) ); } }; @@ -134,7 +134,7 @@ SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource ) { uno::Reference< container::XNamed > xNamed( aSource, uno::UNO_QUERY_THROW ); OUString aName = xNamed->getName(); - return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) ); + return uno::Any( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) ); } void SwVbaBookmarks::removeBookmarkByName( const OUString& rName ) @@ -175,7 +175,7 @@ SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange ) addBookmarkByName( mxModel, rName, xTextRange ); - return uno::makeAny( uno::Reference< word::XBookmark >( new SwVbaBookmark( getParent(), mxContext, mxModel, rName ) ) ); + return uno::Any( uno::Reference< word::XBookmark >( new SwVbaBookmark( getParent(), mxContext, mxModel, rName ) ) ); } sal_Int32 SAL_CALL diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 7f641b829313..4c88228d5876 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -86,7 +86,7 @@ private: default: return; } - m_xProps->setPropertyValue( "TableBorder", uno::makeAny(aTableBorder) ); + m_xProps->setPropertyValue( "TableBorder", uno::Any(aTableBorder) ); } bool getBorderLine( table::BorderLine& rBorderLine ) @@ -167,7 +167,7 @@ public: nLineStyle = word::WdLineStyle::wdLineStyleNone; } } - return uno::makeAny( nLineStyle ); + return uno::Any( nLineStyle ); } void SAL_CALL setLineStyle( const uno::Any& _linestyle ) override { @@ -259,7 +259,7 @@ public: if ( nIndex >= 0 && nIndex < getCount() ) { uno::Reference< beans::XPropertySet > xProps( m_xRange, uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XBorder >( new SwVbaBorder( xProps, m_xContext, supportedIndexTable[ nIndex ] )) ); + return uno::Any( uno::Reference< word::XBorder >( new SwVbaBorder( xProps, m_xContext, supportedIndexTable[ nIndex ] )) ); } throw lang::IndexOutOfBoundsException(); } diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx index 6b9c248caf15..673e38d1497a 100644 --- a/sw/source/ui/vba/vbacell.cxx +++ b/sw/source/ui/vba/vbacell.cxx @@ -78,7 +78,7 @@ void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule ) { // FIXME: handle the argument: heightrule setHeightRule( heightrule ); - setHeight( uno::makeAny( height ) ); + setHeight( uno::Any( height ) ); } OUString diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 72daf252cb69..69cb6e8fd7af 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -82,7 +82,7 @@ public: for( sal_Int32 col = mnLeft; col <= mnRight; col++ ) { if( Index == ( ( row - mnTop ) * ( mnRight - mnLeft + 1 ) + ( col - mnLeft ) ) ) - return uno::makeAny( uno::Reference< word::XCell >( new SwVbaCell( mxParent, mxContext, mxTextTable, col, row ) ) ); + return uno::Any( uno::Reference< word::XCell >( new SwVbaCell( mxParent, mxContext, mxTextTable, col, row ) ) ); } } throw css::lang::IndexOutOfBoundsException(); diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx index 3e2d380f63cb..a0c544588ea2 100644 --- a/sw/source/ui/vba/vbacolumn.cxx +++ b/sw/source/ui/vba/vbacolumn.cxx @@ -68,7 +68,7 @@ void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, c uno::Reference< table::XCellRange > xSelRange = xCellRange->getCellRangeByName( aRangeName ); uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); - xSelection->select( uno::makeAny( xSelRange ) ); + xSelection->select( uno::Any( xSelRange ) ); } OUString diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index 9d9c32db8db1..45647aa8af4e 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -47,7 +47,7 @@ public: { if( nIndex < mxIndexAccess->getCount() ) { - return uno::makeAny( uno::Reference< word::XColumn > ( new SwVbaColumn( mxParent, mxContext, mxTextTable, nIndex++ ) ) ); + return uno::Any( uno::Reference< word::XColumn > ( new SwVbaColumn( mxParent, mxContext, mxTextTable, nIndex++ ) ) ); } throw container::NoSuchElementException(); } @@ -105,7 +105,7 @@ uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /* { throw lang::IndexOutOfBoundsException("Index out of bounds" ); } - return uno::makeAny( uno::Reference< word::XColumn >( new SwVbaColumn( this, mxContext, mxTextTable, nIndex - 1 ) ) ); + return uno::Any( uno::Reference< word::XColumn >( new SwVbaColumn( this, mxContext, mxTextTable, nIndex - 1 ) ) ); } throw uno::RuntimeException("Index out of bounds" ); } diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index 656a2bb942e5..92251ef36da2 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -177,7 +177,7 @@ SwVbaDocument::BuiltInDocumentProperties( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaBuiltinDocumentProperties( mxParent, mxContext, getModel() ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -186,7 +186,7 @@ SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaCustomDocumentProperties( mxParent, mxContext, getModel() ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -196,7 +196,7 @@ SwVbaDocument::Bookmarks( const uno::Any& rIndex ) uno::Reference<container::XIndexAccess > xBookmarks( xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xBookmarksVba( new SwVbaBookmarks( this, mxContext, xBookmarks, getModel() ) ); if ( rIndex.getValueTypeClass() == uno::TypeClass_VOID ) - return uno::makeAny( xBookmarksVba ); + return uno::Any( xBookmarksVba ); return xBookmarksVba->Item( rIndex, uno::Any() ); } @@ -210,7 +210,7 @@ SwVbaDocument::Variables( const uno::Any& rIndex ) uno::Reference< XCollection > xVariables( new SwVbaVariables( this, mxContext, xUserDefined ) ); if ( rIndex.getValueTypeClass() == uno::TypeClass_VOID ) - return uno::makeAny( xVariables ); + return uno::Any( xVariables ); return xVariables->Item( rIndex, uno::Any() ); } @@ -221,7 +221,7 @@ SwVbaDocument::Paragraphs( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaParagraphs( mxParent, mxContext, mxTextDocument ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -230,7 +230,7 @@ SwVbaDocument::Styles( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaStyles( mxParent, mxContext, getModel() ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -239,7 +239,7 @@ SwVbaDocument::Fields( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, getModel() ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -252,7 +252,7 @@ SwVbaDocument::Shapes( const uno::Any& index ) if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -261,7 +261,7 @@ SwVbaDocument::Sections( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaSections( mxParent, mxContext, getModel() ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -270,21 +270,21 @@ SwVbaDocument::TablesOfContents( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaTablesOfContents( this, mxContext, mxTextDocument ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL SwVbaDocument::FormFields( const uno::Any& /*index*/ ) { uno::Reference< XCollection > xCol; - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL SwVbaDocument::PageSetup( ) { uno::Reference< beans::XPropertySet > xPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) ); + return uno::Any( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) ); } OUString @@ -303,7 +303,7 @@ SwVbaDocument::getAttachedTemplate() OUString sTemplateUrl = xDocProps->getTemplateURL(); xTemplate = new SwVbaTemplate( this, mxContext, sTemplateUrl ); - return uno::makeAny( xTemplate ); + return uno::Any( xTemplate ); } void SAL_CALL @@ -337,7 +337,7 @@ SwVbaDocument::Tables( const css::uno::Any& aIndex ) if ( aIndex.hasValue() ) return xColl->Item( aIndex, uno::Any() ); - return uno::makeAny( xColl ); + return uno::Any( xColl ); } void SAL_CALL SwVbaDocument::Activate() @@ -380,7 +380,7 @@ void SAL_CALL SwVbaDocument::setAutoHyphenation( sal_Bool _autohyphenation ) { //TODO uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->setPropertyValue("ParaIsHyphenation", uno::makeAny( _autohyphenation ) ); + xParaProps->setPropertyValue("ParaIsHyphenation", uno::Any( _autohyphenation ) ); } ::sal_Int32 SAL_CALL SwVbaDocument::getHyphenationZone() @@ -407,7 +407,7 @@ void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit( ::sal_Int32 _consecutiv { sal_Int16 nHyphensLimit = static_cast< sal_Int16 >( _consecutivehyphenslimit ); uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->setPropertyValue("ParaHyphenationMaxHyphens", uno::makeAny( nHyphensLimit ) ); + xParaProps->setPropertyValue("ParaHyphenationMaxHyphens", uno::Any( nHyphensLimit ) ); } uno::Reference< ooo::vba::word::XMailMerge > SAL_CALL SwVbaDocument::getMailMerge() @@ -444,7 +444,7 @@ SwVbaDocument::Revisions( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaRevisions( this, mxContext, getModel(), xRedlines ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -455,7 +455,7 @@ SwVbaDocument::Frames( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaFrames( this, mxContext, xFrames, getModel() ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } void SAL_CALL @@ -591,7 +591,7 @@ SwVbaDocument::getValue( const OUString& aPropertyName ) uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext("ooo.vba.ControlProvider", mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); - return uno::makeAny( xControl ); + return uno::Any( xControl ); } sal_Bool SAL_CALL diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 931890a9848f..10ae56ab2d88 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -97,55 +97,55 @@ public: if ( rPropName == "EditingDuration" ) { sal_Int32 const nSecs = m_xDocProps->getEditingDuration(); - return uno::makeAny( nSecs/60 ); // minutes + return uno::Any( nSecs/60 ); // minutes } else if ("Title" == rPropName) { - return uno::makeAny(m_xDocProps->getTitle()); + return uno::Any(m_xDocProps->getTitle()); } else if ("Subject" == rPropName) { - return uno::makeAny(m_xDocProps->getSubject()); + return uno::Any(m_xDocProps->getSubject()); } else if ("Author" == rPropName) { - return uno::makeAny(m_xDocProps->getAuthor()); + return uno::Any(m_xDocProps->getAuthor()); } else if ("Keywords" == rPropName) { - return uno::makeAny(m_xDocProps->getKeywords()); + return uno::Any(m_xDocProps->getKeywords()); } else if ("Description" == rPropName) { - return uno::makeAny(m_xDocProps->getDescription()); + return uno::Any(m_xDocProps->getDescription()); } else if ("Template" == rPropName) { - return uno::makeAny(m_xDocProps->getTemplateName()); + return uno::Any(m_xDocProps->getTemplateName()); } else if ("ModifiedBy" == rPropName) { - return uno::makeAny(m_xDocProps->getModifiedBy()); + return uno::Any(m_xDocProps->getModifiedBy()); } else if ("Generator" == rPropName) { - return uno::makeAny(m_xDocProps->getGenerator()); + return uno::Any(m_xDocProps->getGenerator()); } else if ("PrintDate" == rPropName) { - return uno::makeAny(m_xDocProps->getPrintDate()); + return uno::Any(m_xDocProps->getPrintDate()); } else if ("CreationDate" == rPropName) { - return uno::makeAny(m_xDocProps->getCreationDate()); + return uno::Any(m_xDocProps->getCreationDate()); } else if ("ModifyDate" == rPropName) { - return uno::makeAny(m_xDocProps->getModificationDate()); + return uno::Any(m_xDocProps->getModificationDate()); } else if ("AutoloadURL" == rPropName) { - return uno::makeAny(m_xDocProps->getAutoloadURL()); + return uno::Any(m_xDocProps->getAutoloadURL()); } else { @@ -660,7 +660,7 @@ public: { if ( !hasMoreElements() ) throw container::NoSuchElementException(); - return uno::makeAny( mIt++->second ); + return uno::Any( mIt++->second ); } }; @@ -700,7 +700,7 @@ protected: DocProps::iterator it = mDocProps.find( ++Index ); if ( it == mDocProps.end() ) throw lang::IndexOutOfBoundsException(); - return uno::makeAny( it->second ); + return uno::Any( it->second ); } virtual uno::Any SAL_CALL getByName( const OUString& aName ) override { @@ -825,7 +825,7 @@ public: throw lang::IndexOutOfBoundsException(); // How to determine type e.g Date? ( com.sun.star.util.DateTime ) DocPropInfo aPropInfo = DocPropInfo::createDocPropInfo( aProps[ Index ].Name, aProps[ Index ].Name, mpPropGetSetHelper ); - return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); + return uno::Any( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } virtual uno::Any SAL_CALL getByName( const OUString& aName ) override @@ -834,7 +834,7 @@ public: throw container::NoSuchElementException(); DocPropInfo aPropInfo = DocPropInfo::createDocPropInfo( aName, aName, mpPropGetSetHelper ); - return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); + return uno::Any( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index f9c35ca890e5..a61ca5a4f070 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -221,7 +221,7 @@ static uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xPare uno::Reference< text::XTextField > xTextField( aSource, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextDocument > xTextDocument( xModel, uno::UNO_QUERY_THROW ); uno::Reference< word::XField > xField( new SwVbaField( xParent, xContext, xTextField ) ); - return uno::makeAny( xField ); + return uno::Any( xField ); } namespace { @@ -373,7 +373,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const OUS } uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW ); - xProps->setPropertyValue("FileFormat", uno::makeAny( nFileFormat ) ); + xProps->setPropertyValue("FileFormat", uno::Any( nFileFormat ) ); return xTextField; } @@ -473,7 +473,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const if( bCustom ) { uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW ); - xProps->setPropertyValue("Name", uno::makeAny( aDocProperty ) ); + xProps->setPropertyValue("Name", uno::Any( aDocProperty ) ); } return xTextField; diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx index dcc7be4f4ce1..db34a32f9b64 100644 --- a/sw/source/ui/vba/vbafind.cxx +++ b/sw/source/ui/vba/vbafind.cxx @@ -133,7 +133,7 @@ bool SwVbaFind::SearchReplace() if( xFindOne.is() ) { xFindOne->setString( GetReplaceWith() ); - result = mxSelSupp->select( uno::makeAny( xFindOne ) ); + result = mxSelSupp->select( uno::Any( xFindOne ) ); } break; } @@ -164,7 +164,7 @@ bool SwVbaFind::SearchReplace() { uno::Reference< text::XTextRange > xFindOne = FindOneElement(); if( xFindOne.is() ) - result = mxSelSupp->select( uno::makeAny( xFindOne ) ); + result = mxSelSupp->select( uno::Any( xFindOne ) ); } return result; @@ -182,7 +182,7 @@ void SAL_CALL SwVbaFind::setText( const OUString& _text ) uno::Any SAL_CALL SwVbaFind::getReplacement() { - return uno::makeAny( uno::Reference< word::XReplacement >( new SwVbaReplacement( this, mxContext, mxPropertyReplace ) ) ); + return uno::Any( uno::Reference< word::XReplacement >( new SwVbaReplacement( this, mxContext, mxPropertyReplace ) ) ); } void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) @@ -200,7 +200,7 @@ sal_Bool SAL_CALL SwVbaFind::getForward() void SAL_CALL SwVbaFind::setForward( sal_Bool _forward ) { bool bBackward = !_forward; - mxPropertyReplace->setPropertyValue("SearchBackwards", uno::makeAny( bBackward ) ); + mxPropertyReplace->setPropertyValue("SearchBackwards", uno::Any( bBackward ) ); } ::sal_Int32 SAL_CALL SwVbaFind::getWrap() @@ -234,7 +234,7 @@ sal_Bool SAL_CALL SwVbaFind::getMatchCase() void SAL_CALL SwVbaFind::setMatchCase( sal_Bool _matchcase ) { - mxPropertyReplace->setPropertyValue("SearchCaseSensitive", uno::makeAny( _matchcase ) ); + mxPropertyReplace->setPropertyValue("SearchCaseSensitive", uno::Any( _matchcase ) ); } sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() @@ -246,7 +246,7 @@ sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() void SAL_CALL SwVbaFind::setMatchWholeWord( sal_Bool _matchwholeword ) { - mxPropertyReplace->setPropertyValue("SearchWords", uno::makeAny( _matchwholeword ) ); + mxPropertyReplace->setPropertyValue("SearchWords", uno::Any( _matchwholeword ) ); } sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() @@ -258,7 +258,7 @@ sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() void SAL_CALL SwVbaFind::setMatchWildcards( sal_Bool _matchwildcards ) { - mxPropertyReplace->setPropertyValue("SearchRegularExpression", uno::makeAny( _matchwildcards ) ); + mxPropertyReplace->setPropertyValue("SearchRegularExpression", uno::Any( _matchwildcards ) ); } sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() @@ -271,7 +271,7 @@ sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() void SAL_CALL SwVbaFind::setMatchSoundsLike( sal_Bool _matchsoundslike ) { // seems not accurate - mxPropertyReplace->setPropertyValue("SearchSimilarity", uno::makeAny( _matchsoundslike ) ); + mxPropertyReplace->setPropertyValue("SearchSimilarity", uno::Any( _matchsoundslike ) ); } sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() @@ -286,8 +286,8 @@ sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() void SAL_CALL SwVbaFind::setMatchAllWordForms( sal_Bool _matchallwordforms ) { // seems not accurate - mxPropertyReplace->setPropertyValue("SearchSimilarity", uno::makeAny( _matchallwordforms ) ); - mxPropertyReplace->setPropertyValue("SearchSimilarityRelax", uno::makeAny( _matchallwordforms ) ); + mxPropertyReplace->setPropertyValue("SearchSimilarity", uno::Any( _matchallwordforms ) ); + mxPropertyReplace->setPropertyValue("SearchSimilarityRelax", uno::Any( _matchallwordforms ) ); } uno::Any SAL_CALL SwVbaFind::getStyle() diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index 79642b3109f4..6a6442544a0e 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -120,7 +120,7 @@ SwVbaFont::getUnderline() { sal_Int32 nOOVal = 0; mxFont->getPropertyValue( UnderLineMapper::propName() ) >>= nOOVal; - return uno::makeAny( UnderLineMapper::instance().getMSOFromOOO( nOOVal ) ); + return uno::Any( UnderLineMapper::instance().getMSOFromOOO( nOOVal ) ); } void SAL_CALL @@ -131,7 +131,7 @@ SwVbaFont::setUnderline( const uno::Any& _underline ) if ( _underline >>= nMSOVal ) { sal_Int32 nOOVal = UnderLineMapper::instance().getOOOFromMSO( nMSOVal ); - mxFont->setPropertyValue( UnderLineMapper::propName(), uno::makeAny( nOOVal ) ); + mxFont->setPropertyValue( UnderLineMapper::propName(), uno::Any( nOOVal ) ); } } @@ -167,7 +167,7 @@ SwVbaFont::getColorIndex() break; } } - return uno::makeAny( nIndex ); + return uno::Any( nIndex ); } uno::Any SAL_CALL SwVbaFont::getSubscript() diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx index a149ab9c07e1..2ed29fabc653 100644 --- a/sw/source/ui/vba/vbaframe.cxx +++ b/sw/source/ui/vba/vbaframe.cxx @@ -35,7 +35,7 @@ SwVbaFrame::~SwVbaFrame() void SAL_CALL SwVbaFrame::Select() { uno::Reference< view::XSelectionSupplier > xSelectSupp( mxModel->getCurrentController(), uno::UNO_QUERY_THROW ); - xSelectSupp->select( uno::makeAny( mxTextFrame ) ); + xSelectSupp->select( uno::Any( mxTextFrame ) ); } OUString diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index 676438a19ac1..66042950c944 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -49,7 +49,7 @@ public: if ( !hasMoreElements() ) throw container::NoSuchElementException(); uno::Reference< text::XTextFrame > xTextFrame( mxIndexAccess->getByIndex( nCurrentPos++ ), uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XFrame > ( new SwVbaFrame( mxParent, mxContext, mxModel, xTextFrame ) ) ); + return uno::Any( uno::Reference< word::XFrame > ( new SwVbaFrame( mxParent, mxContext, mxModel, xTextFrame ) ) ); } }; @@ -77,7 +77,7 @@ uno::Any SwVbaFrames::createCollectionObject( const css::uno::Any& aSource ) { uno::Reference< text::XTextFrame > xTextFrame( aSource, uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XFrame > ( new SwVbaFrame( this, mxContext, mxModel, xTextFrame ) ) ); + return uno::Any( uno::Reference< word::XFrame > ( new SwVbaFrame( this, mxContext, mxModel, xTextFrame ) ) ); } OUString diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx index 3382d3155e49..7245d1d143ea 100644 --- a/sw/source/ui/vba/vbaheaderfooter.cxx +++ b/sw/source/ui/vba/vbaheaderfooter.cxx @@ -79,7 +79,7 @@ SwVbaHeaderFooter::Shapes( const uno::Any& index ) uno::Reference< XCollection > xCol( new ScVbaShapes( this, mxContext, xIndexAccess, mxModel ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } OUString diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index 03a997d3ff39..dd84f6206f0a 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -48,7 +48,7 @@ public: { if( Index < 1 || Index > 3 ) throw lang::IndexOutOfBoundsException(); - return uno::makeAny( uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( mxParent, mxContext, mxModel, mxPageStyleProps, mbHeader, Index ) ) ); + return uno::Any( uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( mxParent, mxContext, mxModel, mxPageStyleProps, mbHeader, Index ) ) ); } virtual uno::Type SAL_CALL getElementType( ) override { @@ -74,7 +74,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex < pHeadersFooters->getCount() ) - return pHeadersFooters->Item( uno::makeAny( ++nIndex ), uno::Any() ); + return pHeadersFooters->Item( uno::Any( ++nIndex ), uno::Any() ); throw container::NoSuchElementException(); } }; @@ -99,7 +99,7 @@ uno::Any SAL_CALL SwVbaHeadersFooters::Item( const uno::Any& Index1, const uno:: { throw lang::IndexOutOfBoundsException(); } - return uno::makeAny( uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( this, mxContext, mxModel, mxPageStyleProps, mbHeader, nIndex ) ) ); + return uno::Any( uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( this, mxContext, mxModel, mxPageStyleProps, mbHeader, nIndex ) ) ); } // XEnumerationAccess diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx index 281f09c048af..615eee10ad6e 100644 --- a/sw/source/ui/vba/vbalistformat.cxx +++ b/sw/source/ui/vba/vbalistformat.cxx @@ -83,16 +83,16 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor if( isFirstElement ) { bool isNumberingRestart = !bContinuePreviousList; - xProps->setPropertyValue("ParaIsNumberingRestart", uno::makeAny( isNumberingRestart ) ); + xProps->setPropertyValue("ParaIsNumberingRestart", uno::Any( isNumberingRestart ) ); if( isNumberingRestart ) { - xProps->setPropertyValue("NumberingStartValue", uno::makeAny( sal_Int16(1) ) ); + xProps->setPropertyValue("NumberingStartValue", uno::Any( sal_Int16(1) ) ); } isFirstElement = false; } else { - xProps->setPropertyValue("ParaIsNumberingRestart", uno::makeAny( false ) ); + xProps->setPropertyValue("ParaIsNumberingRestart", uno::Any( false ) ); } rListTemplate.applyListTemplate( xProps ); } diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index 0a4c8084bed0..5ac8e2f3ab1f 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -39,7 +39,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex <= pListGalleries->getCount() ) - return pListGalleries->Item( uno::makeAny( nIndex++ ), uno::Any() ); + return pListGalleries->Item( uno::Any( nIndex++ ), uno::Any() ); throw container::NoSuchElementException(); } }; @@ -64,7 +64,7 @@ uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::A if( nIndex == word::WdListGalleryType::wdBulletGallery || nIndex == word::WdListGalleryType::wdNumberGallery || nIndex == word::WdListGalleryType::wdOutlineNumberGallery ) - return uno::makeAny( uno::Reference< word::XListGallery >( new SwVbaListGallery( this, mxContext, mxTextDocument, nIndex ) ) ); + return uno::Any( uno::Reference< word::XListGallery >( new SwVbaListGallery( this, mxContext, mxTextDocument, nIndex ) ) ); } throw uno::RuntimeException("Index out of bounds" ); } diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx index d7f41e88160f..d224f09fd15c 100644 --- a/sw/source/ui/vba/vbalistgallery.cxx +++ b/sw/source/ui/vba/vbalistgallery.cxx @@ -36,7 +36,7 @@ SwVbaListGallery::ListTemplates( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaListTemplates( mxParent, mxContext, mxTextDocument, mnType ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } OUString diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx index fa7d69a23d20..89e0fd2feef7 100644 --- a/sw/source/ui/vba/vbalisthelper.cxx +++ b/sw/source/ui/vba/vbalisthelper.cxx @@ -94,12 +94,12 @@ void SwVbaListHelper::Init() uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument, uno::UNO_QUERY_THROW ); mxStyleProps.set( xDocMSF->createInstance("com.sun.star.style.NumberingStyle"), uno::UNO_QUERY_THROW ); // insert this style into style family, or the property NumberingRules doesn't exist. - mxStyleFamily->insertByName( msStyleName, uno::makeAny( mxStyleProps ) ); + mxStyleFamily->insertByName( msStyleName, uno::Any( mxStyleProps ) ); mxStyleProps->getPropertyValue("NumberingRules") >>= mxNumberingRules; CreateListTemplate(); - mxStyleProps->setPropertyValue("NumberingRules", uno::makeAny( mxNumberingRules ) ); + mxStyleProps->setPropertyValue("NumberingRules", uno::Any( mxNumberingRules ) ); } } @@ -135,8 +135,8 @@ void SwVbaListHelper::CreateBulletListTemplate() sal_Int32 nLevel = 0; uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_CHAR_STYLE_NAME, uno::makeAny( OUString( "Bullet Symbols" ) ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::makeAny( sal_Int16(style::NumberingType::CHAR_SPECIAL) ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_CHAR_STYLE_NAME, uno::Any( OUString( "Bullet Symbols" ) ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::Any( sal_Int16(style::NumberingType::CHAR_SPECIAL) ) ); OUString aBulletChar; switch( mnTemplateType ) @@ -182,9 +182,9 @@ void SwVbaListHelper::CreateBulletListTemplate() throw css::uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_BULLET_CHAR, uno::makeAny( aBulletChar ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_BULLET_CHAR, uno::Any( aBulletChar ) ); - mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); + mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) ); } void SwVbaListHelper::CreateNumberListTemplate() @@ -246,10 +246,10 @@ void SwVbaListHelper::CreateNumberListTemplate() throw css::uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_SUFFIX, uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::Any( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_SUFFIX, uno::Any( sSuffix ) ); - mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); + mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) ); } void SwVbaListHelper::CreateOutlineNumberListTemplate() @@ -369,10 +369,10 @@ void SwVbaListHelper::CreateOutlineNumberForType1() break; } } - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PREFIX, uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_SUFFIX, uno::makeAny( sSuffix ) ); - mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::Any( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PREFIX, uno::Any( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_SUFFIX, uno::Any( sSuffix ) ); + mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) ); } } @@ -385,14 +385,14 @@ void SwVbaListHelper::CreateOutlineNumberForType2() for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::makeAny( sal_Int16(style::NumberingType::ARABIC) ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_SUFFIX, uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::Any( sal_Int16(style::NumberingType::ARABIC) ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_SUFFIX, uno::Any( sSuffix ) ); if( nLevel != 0 ) { nParentNumbering = sal_Int16( nLevel - 1 ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PARENT_NUMBERING, uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PARENT_NUMBERING, uno::Any( nParentNumbering ) ); } - mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); + mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) ); } } @@ -404,8 +404,8 @@ void SwVbaListHelper::CreateOutlineNumberForType3() for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::makeAny( sal_Int16(style::NumberingType::CHAR_SPECIAL) ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_CHAR_STYLE_NAME, uno::makeAny( OUString("Bullet Symbols") ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::Any( sal_Int16(style::NumberingType::CHAR_SPECIAL) ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_CHAR_STYLE_NAME, uno::Any( OUString("Bullet Symbols") ) ); switch( nLevel ) { case 0: @@ -438,8 +438,8 @@ void SwVbaListHelper::CreateOutlineNumberForType3() break; } } - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_BULLET_CHAR, uno::makeAny( aBulletChar ) ); - mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_BULLET_CHAR, uno::Any( aBulletChar ) ); + mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) ); } } @@ -467,7 +467,7 @@ void SwVbaListHelper::CreateOutlineNumberForType4() nNumberingType = style::NumberingType::ARABIC; sPrefix.clear(); sSuffix = "."; - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PARENT_NUMBERING, uno::makeAny( sal_Int16(0) ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PARENT_NUMBERING, uno::Any( sal_Int16(0) ) ); break; } case 2: @@ -520,10 +520,10 @@ void SwVbaListHelper::CreateOutlineNumberForType4() break; } } - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PREFIX, uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_SUFFIX, uno::makeAny( sSuffix ) ); - mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::Any( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PREFIX, uno::Any( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_SUFFIX, uno::Any( sSuffix ) ); + mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) ); } } @@ -535,13 +535,13 @@ void SwVbaListHelper::CreateOutlineNumberForType5() for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::makeAny( sal_Int16(style::NumberingType::ARABIC) ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::Any( sal_Int16(style::NumberingType::ARABIC) ) ); if( nLevel != 0 ) { nParentNumbering = sal_Int16( nLevel - 1 ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PARENT_NUMBERING, uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PARENT_NUMBERING, uno::Any( nParentNumbering ) ); } - mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); + mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) ); } } @@ -621,10 +621,10 @@ void SwVbaListHelper::CreateOutlineNumberForType6() break; } } - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PREFIX, uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_SUFFIX, uno::makeAny( sSuffix ) ); - mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::Any( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PREFIX, uno::Any( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_SUFFIX, uno::Any( sSuffix ) ); + mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) ); } } @@ -635,9 +635,9 @@ void SwVbaListHelper::CreateOutlineNumberForType7() for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::makeAny( sal_Int16(style::NumberingType::ARABIC) ) ); - setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PREFIX, uno::makeAny( OUString("Chapter ") ) ); - mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE, uno::Any( sal_Int16(style::NumberingType::ARABIC) ) ); + setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PREFIX, uno::Any( OUString("Chapter ") ) ); + mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) ); } } @@ -653,8 +653,8 @@ void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; setOrAppendPropertyValue( aPropertyValues, sName, aValue ); - mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); - mxStyleProps->setPropertyValue("NumberingRules", uno::makeAny( mxNumberingRules ) ); + mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) ); + mxStyleProps->setPropertyValue("NumberingRules", uno::Any( mxNumberingRules ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx index 07374bd9fe72..b69cef41ef8e 100644 --- a/sw/source/ui/vba/vbalistlevel.cxx +++ b/sw/source/ui/vba/vbalistlevel.cxx @@ -88,7 +88,7 @@ void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment ) throw uno::RuntimeException(); } } - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "Adjust", uno::makeAny( nAlignment ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "Adjust", uno::Any( nAlignment ) ); } uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont() @@ -149,7 +149,7 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>= nIndentAt; sal_Int32 nFirstLineIndent = nNumberPosition - nIndentAt; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent", uno::makeAny( nFirstLineIndent ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent", uno::Any( nFirstLineIndent ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle() @@ -287,7 +287,7 @@ void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle ) } } - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "NumberingType", uno::makeAny( nNumberingType ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "NumberingType", uno::Any( nNumberingType ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher() @@ -311,7 +311,7 @@ void SAL_CALL SwVbaListLevel::setResetOnHigher( ::sal_Int32 /*_resetonhigher*/ ) void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat ) { sal_Int16 nStartWith = static_cast<sal_Int16>(_startat); - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "StartWith", uno::makeAny( nStartWith ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "StartWith", uno::Any( nStartWith ) ); } float SAL_CALL SwVbaListLevel::getTabPosition() @@ -325,7 +325,7 @@ float SAL_CALL SwVbaListLevel::getTabPosition() void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition ) { sal_Int32 nTabPosition = Millimeter::getInHundredthsOfOneMillimeter( _tabposition ); - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "ListtabStopPosition", uno::makeAny( nTabPosition ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "ListtabStopPosition", uno::Any( nTabPosition ) ); } float SAL_CALL SwVbaListLevel::getTextPosition() @@ -348,8 +348,8 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) nIndentAt = Millimeter::getInHundredthsOfOneMillimeter( _textposition ); nFirstLineIndent = nAlignedAt - nIndentAt; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "IndentAt", uno::makeAny( nIndentAt ) ); - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent", uno::makeAny( nFirstLineIndent ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "IndentAt", uno::Any( nIndentAt ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent", uno::Any( nFirstLineIndent ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter() @@ -363,7 +363,7 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharacter ) { sal_Int16 nLabelFollowedBy = static_cast<sal_Int16>(_trailingcharacter); - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "LabelFollowedBy", uno::makeAny( nLabelFollowedBy ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "LabelFollowedBy", uno::Any( nLabelFollowedBy ) ); } OUString diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index a83e6fe971dc..1ffd244d066a 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -39,7 +39,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex <= pListLevels->getCount() ) - return pListLevels->Item( uno::makeAny( nIndex++ ), uno::Any() ); + return pListLevels->Item( uno::Any( nIndex++ ), uno::Any() ); throw container::NoSuchElementException(); } }; @@ -69,7 +69,7 @@ uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& if( nIndex <=0 || nIndex > getCount() ) throw uno::RuntimeException("Index out of bounds" ); - return uno::makeAny( uno::Reference< word::XListLevel >( new SwVbaListLevel( this, mxContext, pListHelper, nIndex - 1 ) ) ); + return uno::Any( uno::Reference< word::XListLevel >( new SwVbaListLevel( this, mxContext, pListHelper, nIndex - 1 ) ) ); } // XEnumerationAccess diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx index cffea7728051..b2b69ee67318 100644 --- a/sw/source/ui/vba/vbalisttemplate.cxx +++ b/sw/source/ui/vba/vbalisttemplate.cxx @@ -38,13 +38,13 @@ SwVbaListTemplate::ListLevels( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaListLevels( mxParent, mxContext, pListHelper ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet > const & xProps ) { uno::Reference< container::XIndexReplace > xNumberingRules = pListHelper->getNumberingRules(); - xProps->setPropertyValue("NumberingRules", uno::makeAny( xNumberingRules ) ); + xProps->setPropertyValue("NumberingRules", uno::Any( xNumberingRules ) ); } OUString diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index ffcef424b938..9902dd4f2390 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -38,7 +38,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex <= pListTemplates->getCount() ) - return pListTemplates->Item( uno::makeAny( nIndex++ ), uno::Any() ); + return pListTemplates->Item( uno::Any( nIndex++ ), uno::Any() ); throw container::NoSuchElementException(); } }; @@ -63,7 +63,7 @@ uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::A if( nIndex <=0 || nIndex > getCount() ) throw uno::RuntimeException("Index out of bounds" ); - return uno::makeAny( uno::Reference< word::XListTemplate >( new SwVbaListTemplate( this, mxContext, mxTextDocument, mnGalleryType, nIndex ) ) ); + return uno::Any( uno::Reference< word::XListTemplate >( new SwVbaListTemplate( this, mxContext, mxTextDocument, mnGalleryType, nIndex ) ) ); } // XEnumerationAccess diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx index 7b02b4794322..ef74dcd8a6f0 100644 --- a/sw/source/ui/vba/vbaoptions.cxx +++ b/sw/source/ui/vba/vbaoptions.cxx @@ -86,7 +86,7 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) break; } } - return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) ); + return uno::Any( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) ); } void SwVbaOptions::setValueEvent( const uno::Any& value ) @@ -105,7 +105,7 @@ void SwVbaOptions::setValueEvent( const uno::Any& value ) { sNewPathUrl = sOldPathUrl.subView( 0, nIndex + 1 ) + sNewPathUrl; } - xPathSettings->setPropertyValue( msDefaultFilePath, uno::makeAny( sNewPathUrl ) ); + xPathSettings->setPropertyValue( msDefaultFilePath, uno::Any( sNewPathUrl ) ); } uno::Any SwVbaOptions::getValueEvent() @@ -122,7 +122,7 @@ uno::Any SwVbaOptions::getValueEvent() } OUString sPath; ::osl::File::getSystemPathFromFileURL( sPathUrl, sPath ); - return uno::makeAny( sPath ); + return uno::Any( sPath ); } sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineStyle() diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index 45e4ca87477b..b22437dbd260 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -59,7 +59,7 @@ double SAL_CALL SwVbaPageSetup::getHeaderDistance() bool isHeaderOn = false; mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn; if( !isHeaderOn ) - mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( true ) ); + mxPageProps->setPropertyValue("HeaderIsOn", uno::Any( true ) ); return VbaPageSetupBase::getHeaderMargin(); } @@ -82,7 +82,7 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn; if( !isHeaderOn ) - mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( true ) ); + mxPageProps->setPropertyValue("HeaderIsOn", uno::Any( true ) ); mxPageProps->getPropertyValue("TopMargin") >>= currentTopMargin; mxPageProps->getPropertyValue("HeaderBodyDistance") >>= currentSpacing; @@ -92,9 +92,9 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) sal_Int32 height = currentHeaderHeight - currentSpacing; sal_Int32 newHeaderHeight = newSpacing + height; - mxPageProps->setPropertyValue("TopMargin", uno::makeAny( newHeaderDistance ) ); - mxPageProps->setPropertyValue("HeaderBodyDistance", uno::makeAny( newSpacing ) ); - mxPageProps->setPropertyValue("HeaderHeight", uno::makeAny( newHeaderHeight ) ); + mxPageProps->setPropertyValue("TopMargin", uno::Any( newHeaderDistance ) ); + mxPageProps->setPropertyValue("HeaderBodyDistance", uno::Any( newSpacing ) ); + mxPageProps->setPropertyValue("HeaderHeight", uno::Any( newHeaderHeight ) ); } double SAL_CALL SwVbaPageSetup::getFooterDistance() @@ -102,7 +102,7 @@ double SAL_CALL SwVbaPageSetup::getFooterDistance() bool isFooterOn = false; mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn; if( !isFooterOn ) - mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( true ) ); + mxPageProps->setPropertyValue("FooterIsOn", uno::Any( true ) ); return VbaPageSetupBase::getFooterMargin(); } @@ -116,7 +116,7 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn; if( !isFooterOn ) - mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( true ) ); + mxPageProps->setPropertyValue("FooterIsOn", uno::Any( true ) ); mxPageProps->getPropertyValue("BottomMargin") >>= currentBottomMargin; mxPageProps->getPropertyValue("FooterBodyDistance") >>= currentSpacing; @@ -126,9 +126,9 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) sal_Int32 height = currentFooterHeight - currentSpacing; sal_Int32 newFooterHeight = newSpacing + height; - mxPageProps->setPropertyValue("BottomMargin", uno::makeAny( newFooterDistance ) ); - mxPageProps->setPropertyValue("FooterBodyDistance", uno::makeAny( newSpacing ) ); - mxPageProps->setPropertyValue("FooterHeight", uno::makeAny( newFooterHeight ) ); + mxPageProps->setPropertyValue("BottomMargin", uno::Any( newFooterDistance ) ); + mxPageProps->setPropertyValue("FooterBodyDistance", uno::Any( newSpacing ) ); + mxPageProps->setPropertyValue("FooterHeight", uno::Any( newFooterHeight ) ); } sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() @@ -171,8 +171,8 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status { nTopMargin += nHeaderHeight; nBottomMargin += nFooterHeight; - xStyleProps->setPropertyValue("HeaderIsOn", uno::makeAny( false ) ); - xStyleProps->setPropertyValue("FooterIsOn", uno::makeAny( false ) ); + xStyleProps->setPropertyValue("HeaderIsOn", uno::Any( false ) ); + xStyleProps->setPropertyValue("FooterIsOn", uno::Any( false ) ); } uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW ); if( xPageCursor->getPage() != 1 ) @@ -184,18 +184,18 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue("TextTable"), uno::UNO_QUERY ); if( xTableProps.is() ) { - xTableProps->setPropertyValue("PageDescName", uno::makeAny( newStyle ) ); + xTableProps->setPropertyValue("PageDescName", uno::Any( newStyle ) ); } else { - xCursorProps->setPropertyValue("PageDescName", uno::makeAny( newStyle ) ); + xCursorProps->setPropertyValue("PageDescName", uno::Any( newStyle ) ); } uno::Reference< beans::XPropertySet > xFirstPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); - xFirstPageProps->setPropertyValue("TopMargin", uno::makeAny( nTopMargin ) ); - xFirstPageProps->setPropertyValue("BottomMargin", uno::makeAny( nBottomMargin ) ); - xFirstPageProps->setPropertyValue("LeftMargin", uno::makeAny( nLeftMargin ) ); - xFirstPageProps->setPropertyValue("RightMargin", uno::makeAny( nRightMargin ) ); + xFirstPageProps->setPropertyValue("TopMargin", uno::Any( nTopMargin ) ); + xFirstPageProps->setPropertyValue("BottomMargin", uno::Any( nBottomMargin ) ); + xFirstPageProps->setPropertyValue("LeftMargin", uno::Any( nLeftMargin ) ); + xFirstPageProps->setPropertyValue("RightMargin", uno::Any( nRightMargin ) ); } OUString SwVbaPageSetup::getStyleOfFirstPage() const diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index 9bb41947c779..351f2711c586 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -67,7 +67,7 @@ public: { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); - return uno::makeAny( sal_Int32( ColorTable[ Index ] ) ); + return uno::Any( sal_Int32( ColorTable[ Index ] ) ); } // Methods XElementAccess diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx index f7f6fc54021d..7f14b69bfefc 100644 --- a/sw/source/ui/vba/vbapane.cxx +++ b/sw/source/ui/vba/vbapane.cxx @@ -36,7 +36,7 @@ SwVbaPane::~SwVbaPane() uno::Any SAL_CALL SwVbaPane::View() { - return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, mxModel ) ) ); + return uno::Any( uno::Reference< word::XView >( new SwVbaView( this, mxContext, mxModel ) ) ); } void SAL_CALL diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index a9e4373803f0..cc507a6f840f 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -45,7 +45,7 @@ public: { if( Index != 0 ) throw lang::IndexOutOfBoundsException(); - return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) ); + return uno::Any( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) ); } virtual uno::Type SAL_CALL getElementType( ) override { diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index 5d0363e924ce..28cd264c1bc4 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -119,7 +119,7 @@ public: if( xServiceInfo->supportsService("com.sun.star.text.Paragraph") ) { if( Index == nCount ) - return uno::makeAny( xServiceInfo ); + return uno::Any( xServiceInfo ); nCount++; } } @@ -156,7 +156,7 @@ uno::Any SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource ) { uno::Reference< text::XTextRange > xTextRange( aSource, uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XParagraph >( new SwVbaParagraph( this, mxContext, mxTextDocument, xTextRange ) ) ); + return uno::Any( uno::Reference< word::XParagraph >( new SwVbaParagraph( this, mxContext, mxTextDocument, xTextRange ) ) ); } OUString diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 3286e331e49f..7838a6f76bc1 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -55,7 +55,7 @@ sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment() void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment ) { style::ParagraphAdjust aParaAdjust = getOOoAlignment( _alignment ); - mxParaProps->setPropertyValue("ParaAdjust", uno::makeAny( aParaAdjust ) ); + mxParaProps->setPropertyValue("ParaAdjust", uno::Any( aParaAdjust ) ); } float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() @@ -68,14 +68,14 @@ float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) { sal_Int32 indent = Millimeter::getInHundredthsOfOneMillimeter( _firstlineindent ); - mxParaProps->setPropertyValue("ParaFirstLineIndent", uno::makeAny( indent ) ); + mxParaProps->setPropertyValue("ParaFirstLineIndent", uno::Any( indent ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() { bool bKeep = false; mxParaProps->getPropertyValue("ParaKeepTogether") >>= bKeep; - return uno::makeAny ( bKeep ); + return uno::Any ( bKeep ); } void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogether ) @@ -83,7 +83,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth bool bKeep = false; if( _keeptogether >>= bKeep ) { - mxParaProps->setPropertyValue("ParaKeepTogether", uno::makeAny( bKeep ) ); + mxParaProps->setPropertyValue("ParaKeepTogether", uno::Any( bKeep ) ); } else { @@ -95,7 +95,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() { bool bKeep = false; mxParaProps->getPropertyValue("ParaSplit") >>= bKeep; - return uno::makeAny ( bKeep ); + return uno::Any ( bKeep ); } void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithnext ) @@ -103,7 +103,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne bool bKeep = false; if( _keepwithnext >>= bKeep ) { - mxParaProps->setPropertyValue("ParaSplit", uno::makeAny( bKeep ) ); + mxParaProps->setPropertyValue("ParaSplit", uno::Any( bKeep ) ); } else { @@ -115,7 +115,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() { bool bHypn = false; mxParaProps->getPropertyValue("ParaIsHyphenation") >>= bHypn; - return uno::makeAny ( bHypn ); + return uno::Any ( bHypn ); } void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation ) @@ -123,7 +123,7 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation bool bHypn = false; if( _hyphenation >>= bHypn ) { - mxParaProps->setPropertyValue("ParaIsHyphenation", uno::makeAny( bHypn ) ); + mxParaProps->setPropertyValue("ParaIsHyphenation", uno::Any( bHypn ) ); } else { @@ -143,7 +143,7 @@ void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) style::LineSpacing aLineSpacing; mxParaProps->getPropertyValue("ParaLineSpacing") >>= aLineSpacing; aLineSpacing = getOOoLineSpacing( _linespacing, aLineSpacing.Mode ); - mxParaProps->setPropertyValue("ParaLineSpacing", uno::makeAny( aLineSpacing ) ); + mxParaProps->setPropertyValue("ParaLineSpacing", uno::Any( aLineSpacing ) ); } sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() @@ -156,14 +156,14 @@ sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule ) { style::LineSpacing aLineSpacing = getOOoLineSpacingFromRule( _linespacingrule ); - mxParaProps->setPropertyValue("ParaLineSpacing", uno::makeAny( aLineSpacing ) ); + mxParaProps->setPropertyValue("ParaLineSpacing", uno::Any( aLineSpacing ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() { bool noLineNum = false; mxParaProps->getPropertyValue("ParaLineNumberCount") >>= noLineNum; - return uno::makeAny ( noLineNum ); + return uno::Any ( noLineNum ); } void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumber ) @@ -171,7 +171,7 @@ void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumb bool noLineNum = false; if( _nolinenumber >>= noLineNum ) { - mxParaProps->setPropertyValue("ParaLineNumberCount", uno::makeAny( noLineNum ) ); + mxParaProps->setPropertyValue("ParaLineNumberCount", uno::Any( noLineNum ) ); } else { @@ -206,7 +206,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() style::BreakType aBreakType; mxParaProps->getPropertyValue("BreakType") >>= aBreakType; bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH ); - return uno::makeAny( bBreakBefore ); + return uno::Any( bBreakBefore ); } void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbefore ) @@ -230,7 +230,7 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe else if ( aBreakType == style::BreakType_PAGE_BEFORE ) aBreakType = style::BreakType_PAGE_AFTER; } - mxParaProps->setPropertyValue("BreakType", uno::makeAny( aBreakType ) ); + mxParaProps->setPropertyValue("BreakType", uno::Any( aBreakType ) ); } else { @@ -248,7 +248,7 @@ float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space ); - mxParaProps->setPropertyValue("ParaTopMargin", uno::makeAny( nSpace ) ); + mxParaProps->setPropertyValue("ParaTopMargin", uno::Any( nSpace ) ); } float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() @@ -261,7 +261,7 @@ float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space ); - mxParaProps->setPropertyValue("ParaBottomMargin", uno::makeAny( nSpace ) ); + mxParaProps->setPropertyValue("ParaBottomMargin", uno::Any( nSpace ) ); } float SAL_CALL SwVbaParagraphFormat::getLeftIndent() @@ -274,7 +274,7 @@ float SAL_CALL SwVbaParagraphFormat::getLeftIndent() void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) { sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _leftindent ); - mxParaProps->setPropertyValue("ParaLeftMargin", uno::makeAny( nIndent ) ); + mxParaProps->setPropertyValue("ParaLeftMargin", uno::Any( nIndent ) ); } float SAL_CALL SwVbaParagraphFormat::getRightIndent() @@ -287,12 +287,12 @@ float SAL_CALL SwVbaParagraphFormat::getRightIndent() void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) { sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _rightindent ); - mxParaProps->setPropertyValue("ParaRightMargin", uno::makeAny( nIndent ) ); + mxParaProps->setPropertyValue("ParaRightMargin", uno::Any( nIndent ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() { - return uno::makeAny( uno::Reference< word::XTabStops >( new SwVbaTabStops( this, mxContext, mxParaProps ) ) ); + return uno::Any( uno::Reference< word::XTabStops >( new SwVbaTabStops( this, mxContext, mxParaProps ) ) ); } void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) @@ -309,7 +309,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() // if the amount of single lines on one page > 1 and the same of start and end of the paragraph, // true is returned. bool bWidow = ( nWidow > 1 && nOrphan == nWidow ); - return uno::makeAny( bWidow ); + return uno::Any( bWidow ); } void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontrol ) @@ -320,8 +320,8 @@ void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontr if( _widowcontrol >>= bWidow ) { sal_Int8 nControl = bWidow? 2:1; - mxParaProps->setPropertyValue("ParaWidows", uno::makeAny( nControl ) ); - mxParaProps->setPropertyValue("ParaOrphans", uno::makeAny( nControl ) ); + mxParaProps->setPropertyValue("ParaWidows", uno::Any( nControl ) ); + mxParaProps->setPropertyValue("ParaOrphans", uno::Any( nControl ) ); } else { diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index 88f54a1d43c0..eaa7cac51c3b 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -205,7 +205,7 @@ void SAL_CALL SwVbaRange::InsertBreak(const uno::Any& _breakType) } uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue("BreakType", uno::makeAny( eBreakType ) ); + xProp->setPropertyValue("BreakType", uno::Any( eBreakType ) ); } } @@ -280,7 +280,7 @@ SwVbaRange::getStyle() uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xStyleProps( xStylesAccess->getByName( aStyleName ), uno::UNO_QUERY_THROW ); uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xModel, xStyleProps ) ) ); + return uno::Any( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xModel, xStyleProps ) ) ); } void SAL_CALL @@ -326,7 +326,7 @@ SwVbaRange::PageSetup( ) uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_SET_THROW ); uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName("PageStyles"), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, xModel, xPageProps ) ) ); + return uno::Any( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, xModel, xPageProps ) ) ); } ::sal_Int32 SAL_CALL SwVbaRange::getStart() @@ -380,7 +380,7 @@ SwVbaRange::Revisions( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaRevisions( mxParent, mxContext, xModel, xTextRange ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -391,7 +391,7 @@ SwVbaRange::Sections( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaSections( mxParent, mxContext, xModel, xTextRange ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -402,7 +402,7 @@ SwVbaRange::Fields( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, xModel ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } OUString diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 03ab7c886b1d..b394fa1170c6 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -46,7 +46,7 @@ public: if ( !hasMoreElements() ) throw container::NoSuchElementException(); uno::Reference< beans::XPropertySet > xRevision( *mIt++ ); - return uno::makeAny( xRevision ) ; + return uno::Any( xRevision ) ; } }; @@ -68,7 +68,7 @@ RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const u if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); - return uno::makeAny( mRevisionMap[ Index ] ); + return uno::Any( mRevisionMap[ Index ] ); } // XEnumerationAccess @@ -109,7 +109,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< beans::XPropertySet > xRevision( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XRevision > ( new SwVbaRevision( m_xParent, m_xContext, m_xModel, xRevision ) ) ); + return uno::Any( uno::Reference< word::XRevision > ( new SwVbaRevision( m_xParent, m_xContext, m_xModel, xRevision ) ) ); } }; @@ -141,7 +141,7 @@ uno::Any SwVbaRevisions::createCollectionObject( const css::uno::Any& aSource ) { uno::Reference< beans::XPropertySet > xRevision( aSource, uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XRevision > ( new SwVbaRevision( this, mxContext, mxModel, xRevision ) ) ); + return uno::Any( uno::Reference< word::XRevision > ( new SwVbaRevision( this, mxContext, mxModel, xRevision ) ) ); } void SAL_CALL SwVbaRevisions::AcceptAll( ) diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index 4ce00b71616d..6b9aa84b8d29 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -43,11 +43,11 @@ SwVbaRow::~SwVbaRow() uno::Any SAL_CALL SwVbaRow::getHeight() { if( getHeightRule() == word::WdRowHeightRule::wdRowHeightAuto ) - return uno::makeAny( sal_Int32( word::WdConstants::wdUndefined ) ); + return uno::Any( sal_Int32( word::WdConstants::wdUndefined ) ); sal_Int32 nHeight = 0; mxRowProps->getPropertyValue("Height") >>= nHeight; - return uno::makeAny( static_cast<float>(Millimeter::getInPoints( nHeight )) ); + return uno::Any( static_cast<float>(Millimeter::getInPoints( nHeight )) ); } void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) @@ -56,7 +56,7 @@ void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) _height >>= height; sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( height ); - mxRowProps->setPropertyValue("Height", uno::makeAny( nHeight ) ); + mxRowProps->setPropertyValue("Height", uno::Any( nHeight ) ); } ::sal_Int32 SAL_CALL SwVbaRow::getHeightRule() @@ -69,7 +69,7 @@ void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule ) { bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto ); - mxRowProps->setPropertyValue("IsAutoHeight", uno::makeAny( isAutoHeight ) ); + mxRowProps->setPropertyValue("IsAutoHeight", uno::Any( isAutoHeight ) ); } void SAL_CALL @@ -92,13 +92,13 @@ void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const u uno::Reference< table::XCellRange > xSelRange = xCellRange->getCellRangeByName( sRangeName ); uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); - xSelection->select( uno::makeAny( xSelRange ) ); + xSelection->select( uno::Any( xSelRange ) ); } void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule ) { setHeightRule( heightrule ); - setHeight( uno::makeAny( height ) ); + setHeight( uno::Any( height ) ); } OUString diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index 08afc401ef7c..5ebca8eef3b4 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -55,7 +55,7 @@ public: { if( nIndex < mxIndexAccess->getCount() ) { - return uno::makeAny( uno::Reference< word::XRow > ( new SwVbaRow( mxParent, mxContext, mxTextTable, nIndex++ ) ) ); + return uno::Any( uno::Reference< word::XRow > ( new SwVbaRow( mxParent, mxContext, mxTextTable, nIndex++ ) ) ); } throw container::NoSuchElementException(); } @@ -127,7 +127,7 @@ void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) } } uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); - xTableProps->setPropertyValue("HoriOrient", uno::makeAny( nAlignment ) ); + xTableProps->setPropertyValue("HoriOrient", uno::Any( nAlignment ) ); } uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() @@ -145,10 +145,10 @@ uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() } if( bSplit != bAllowBreak ) { - return uno::makeAny( sal_Int32(word::WdConstants::wdUndefined) ); + return uno::Any( sal_Int32(word::WdConstants::wdUndefined) ); } } - return uno::makeAny( bAllowBreak ); + return uno::Any( bAllowBreak ); } void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakacrosspages ) @@ -159,7 +159,7 @@ void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakac for( sal_Int32 index = mnStartRowIndex; index <= mnEndRowIndex; ++index ) { uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); - xRowProps->setPropertyValue("IsSplitAllowed", uno::makeAny( bAllowBreak ) ); + xRowProps->setPropertyValue("IsSplitAllowed", uno::Any( bAllowBreak ) ); } } @@ -187,8 +187,8 @@ void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns ) for( sal_Int32 column = 0; column < nColumns; ++column ) { uno::Reference< beans::XPropertySet > xCellProps( xCellRange->getCellByPosition( column, row ), uno::UNO_QUERY_THROW ); - xCellProps->setPropertyValue("LeftBorderDistance", uno::makeAny( nSpace ) ); - xCellProps->setPropertyValue("RightBorderDistance", uno::makeAny( nSpace ) ); + xCellProps->setPropertyValue("LeftBorderDistance", uno::Any( nSpace ) ); + xCellProps->setPropertyValue("RightBorderDistance", uno::Any( nSpace ) ); } } } @@ -237,13 +237,13 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) sal_Int32 nMargin = 0; xTableProps->getPropertyValue("LeftMargin") >>= nMargin; nMargin += indent; - xTableProps->setPropertyValue("LeftMargin", uno::makeAny( nMargin ) ); + xTableProps->setPropertyValue("LeftMargin", uno::Any( nMargin ) ); } void SwVbaRows::setIndentWithAdjustFirstColumn( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) { uno::Reference< XCollection > xCol( xColumns, uno::UNO_QUERY_THROW ); - uno::Reference< word::XColumn > xColumn( xCol->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW ); + uno::Reference< word::XColumn > xColumn( xCol->Item( uno::Any( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW ); sal_Int32 nWidth = xColumn->getWidth(); nWidth -= indent; xColumn->setWidth( nWidth ); @@ -274,7 +274,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) sal_Int32 nColCount = xCol->getCount(); for( sal_Int32 i = 0; i < nColCount; i++ ) { - uno::Reference< word::XColumn > xColumn( xCol->Item( uno::makeAny( i ), uno::Any() ), uno::UNO_QUERY_THROW ); + uno::Reference< word::XColumn > xColumn( xCol->Item( uno::Any( i ), uno::Any() ), uno::UNO_QUERY_THROW ); sal_Int32 nColWidth = xColumn->getWidth(); sal_Int32 nNewColWidth = static_cast<sal_Int32>( propFactor * nColWidth ); xColumn->setWidth( nNewColWidth ); @@ -282,7 +282,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) // set the width and position of the table setIndentWithAdjustNone( indent ); - xTableProps->setPropertyValue("Width", uno::makeAny( nNewWidth ) ); + xTableProps->setPropertyValue("Width", uno::Any( nNewWidth ) ); } void SwVbaRows::setIndentWithAdjustSameWidth( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) @@ -299,13 +299,13 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) sal_Int32 nNewColWidth = static_cast<sal_Int32>( double( nNewWidth )/nColCount ); for( sal_Int32 i = 0; i < nColCount; i++ ) { - uno::Reference< word::XColumn > xColumn( xCol->Item( uno::makeAny( i ), uno::Any() ), uno::UNO_QUERY_THROW ); + uno::Reference< word::XColumn > xColumn( xCol->Item( uno::Any( i ), uno::Any() ), uno::UNO_QUERY_THROW ); xColumn->setWidth( nNewColWidth ); } // set the width and position of the table setIndentWithAdjustNone( indent ); - xTableProps->setPropertyValue("Width", uno::makeAny( nNewWidth ) ); + xTableProps->setPropertyValue("Width", uno::Any( nNewWidth ) ); } void SAL_CALL SwVbaRows::Select( ) @@ -327,7 +327,7 @@ uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not { throw lang::IndexOutOfBoundsException("Index out of bounds" ); } - return uno::makeAny( uno::Reference< word::XRow >( new SwVbaRow( this, mxContext, mxTextTable, nIndex - 1 ) ) ); + return uno::Any( uno::Reference< word::XRow >( new SwVbaRow( this, mxContext, mxTextTable, nIndex - 1 ) ) ); } throw uno::RuntimeException("Index out of bounds" ); } diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx index 53be97c3b6b0..4ef15bf94be0 100644 --- a/sw/source/ui/vba/vbasection.cxx +++ b/sw/source/ui/vba/vbasection.cxx @@ -47,7 +47,7 @@ uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, true ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL SwVbaSection::Footers( const uno::Any& index ) @@ -55,13 +55,13 @@ uno::Any SAL_CALL SwVbaSection::Footers( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, false ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL SwVbaSection::PageSetup( ) { - return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) ); + return uno::Any( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) ); } OUString diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index 0665ebfce809..9d940416c756 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -46,7 +46,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) override { if ( hasMoreElements() ) - return uno::makeAny( *mIt++ ); + return uno::Any( *mIt++ ); throw container::NoSuchElementException(); } }; @@ -102,7 +102,7 @@ public: throw css::lang::IndexOutOfBoundsException(); uno::Reference< beans::XPropertySet > xPageProps( mxSections[ Index ], uno::UNO_SET_THROW ); - return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent, mxContext, mxModel, xPageProps ) ) ); + return uno::Any( uno::Reference< word::XSection >( new SwVbaSection( mxParent, mxContext, mxModel, xPageProps ) ) ); } virtual uno::Type SAL_CALL getElementType( ) override { @@ -129,7 +129,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< beans::XPropertySet > xPageProps( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XSection > ( new SwVbaSection( m_xParent, m_xContext, mxModel, xPageProps ) ) ); + return uno::Any( uno::Reference< word::XSection > ( new SwVbaSection( m_xParent, m_xContext, mxModel, xPageProps ) ) ); } }; diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index 309227c30354..dde7d4e21fb5 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -406,7 +406,7 @@ SwVbaSelection::MoveRight(const uno::Any& _unit, const uno::Any& _count, const u if( nCount < 0 ) { - MoveLeft( _unit, uno::makeAny( -nCount ), _extend ); + MoveLeft( _unit, uno::Any( -nCount ), _extend ); return; } @@ -425,7 +425,7 @@ SwVbaSelection::MoveLeft(const uno::Any& _unit, const uno::Any& _count, const un if( nCount < 0 ) { - MoveRight( _unit, uno::makeAny( -nCount ), _extend ); + MoveRight( _unit, uno::Any( -nCount ), _extend ); return; } @@ -445,7 +445,7 @@ SwVbaSelection::MoveDown(const uno::Any& _unit, const uno::Any& _count, const un if( nCount < 0 ) { - MoveUp( _unit, uno::makeAny( -nCount ), _extend ); + MoveUp( _unit, uno::Any( -nCount ), _extend ); return; } @@ -465,7 +465,7 @@ SwVbaSelection::MoveUp(const uno::Any& _unit, const uno::Any& _count, const uno: if( nCount < 0 ) { - MoveDown( _unit, uno::makeAny( -nCount ), _extend ); + MoveDown( _unit, uno::Any( -nCount ), _extend ); return; } @@ -815,7 +815,7 @@ SwVbaSelection::Fields( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, mxModel ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Reference< word::XHeaderFooter > SAL_CALL @@ -851,7 +851,7 @@ SwVbaSelection::ShapeRange( ) uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< drawing::XDrawPage > xDrawPage = xDrawPageSupplier->getDrawPage(); uno::Reference< container::XIndexAccess > xShapesAccess( xShapes, uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< msforms::XShapeRange >( new ScVbaShapeRange( this, mxContext, xShapesAccess, xDrawPage, mxModel ) ) ); + return uno::Any( uno::Reference< msforms::XShapeRange >( new ScVbaShapeRange( this, mxContext, xShapesAccess, xDrawPage, mxModel ) ) ); } ::sal_Int32 SAL_CALL SwVbaSelection::getStart() @@ -908,7 +908,7 @@ uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaRows( this, mxContext, xTextTable, xTextTable->getRows(), nStartRow, nEndRow ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index ) @@ -934,7 +934,7 @@ uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaColumns( this, mxContext, xTextTable, xTextTable->getColumns(), nStartColumn, nEndColumn ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable() const @@ -1019,7 +1019,7 @@ uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaCells( this, mxContext, xTextTable, nLeft, nTop, nRight, nBottom ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } void SAL_CALL SwVbaSelection::Copy( ) diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 5565575f342a..830e749b681e 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -57,7 +57,7 @@ LanguageType SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySe void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, LanguageType _languageid ) { lang::Locale aLocale = LanguageTag( _languageid ).getLocale(); - xTCProps->setPropertyValue("CharLocale", uno::makeAny( aLocale ) ) ; + xTCProps->setPropertyValue("CharLocale", uno::Any( aLocale ) ) ; } ::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() @@ -105,7 +105,7 @@ void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaPro if( !sStyle.isEmpty() ) { - xParaProps->setPropertyValue("ParaStyleName", uno::makeAny( sStyle ) ); + xParaProps->setPropertyValue("ParaStyleName", uno::Any( sStyle ) ); return; } @@ -121,7 +121,7 @@ OUString SAL_CALL SwVbaStyle::getNameLocal() void SAL_CALL SwVbaStyle::setNameLocal( const OUString& _namelocal ) { - mxStyleProps->setPropertyValue("DisplayName", uno::makeAny( _namelocal ) ); + mxStyleProps->setPropertyValue("DisplayName", uno::Any( _namelocal ) ); } uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat() @@ -144,7 +144,7 @@ sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate() void SAL_CALL SwVbaStyle::setAutomaticallyUpdate( sal_Bool _automaticallyupdate ) { - mxStyleProps->setPropertyValue("IsAutoUpdate", uno::makeAny( _automaticallyupdate ) ); + mxStyleProps->setPropertyValue("IsAutoUpdate", uno::Any( _automaticallyupdate ) ); } uno::Any SAL_CALL SwVbaStyle::getBaseStyle() @@ -158,7 +158,7 @@ uno::Any SAL_CALL SwVbaStyle::getBaseStyle() } uno::Reference< XCollection > xCol( new SwVbaStyles( this, mxContext, mxModel ) ); - return xCol->Item( uno::makeAny( sBaseStyle ), uno::Any() ); + return xCol->Item( uno::Any( sBaseStyle ), uno::Any() ); } void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) @@ -171,7 +171,7 @@ void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) } OUString sBaseStyle = xStyle->getName(); - mxStyleProps->setPropertyValue("ParentStyle", uno::makeAny( sBaseStyle ) ); + mxStyleProps->setPropertyValue("ParentStyle", uno::Any( sBaseStyle ) ); } uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() @@ -185,7 +185,7 @@ uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() } uno::Reference< XCollection > xCol( new SwVbaStyles( this, mxContext, mxModel ) ); - return xCol->Item( uno::makeAny( sFollowStyle ), uno::Any() ); + return xCol->Item( uno::Any( sFollowStyle ), uno::Any() ); } void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphstyle ) @@ -198,7 +198,7 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs } OUString sFollowStyle = xStyle->getName(); - mxStyleProps->setPropertyValue("FollowStyle", uno::makeAny( sFollowStyle ) ); + mxStyleProps->setPropertyValue("FollowStyle", uno::Any( sFollowStyle ) ); } ::sal_Int32 SAL_CALL SwVbaStyle::getListLevelNumber() diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index f14758eb8810..12217e15324c 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -269,7 +269,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex <= pStyles->getCount() ) - return pStyles->Item( uno::makeAny( nIndex++ ), uno::Any() ); + return pStyles->Item( uno::Any( nIndex++ ), uno::Any() ); throw container::NoSuchElementException(); } }; @@ -286,7 +286,7 @@ uno::Any SwVbaStyles::createCollectionObject(const uno::Any& aObject) { uno::Reference< beans::XPropertySet > xStyleProp( aObject, uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, mxModel, xStyleProp ) ) ); + return uno::Any( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, mxModel, xStyleProp ) ) ); } uno::Type SAL_CALL @@ -344,9 +344,9 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) // set the property "NumberingStyleName" if it is a listbullet if( pTable->wdStyleType == word::WdStyleType::wdStyleTypeList ) { - xStyleProps->setPropertyValue("NumberingStyleName", uno::makeAny( aStyleName ) ); + xStyleProps->setPropertyValue("NumberingStyleName", uno::Any( aStyleName ) ); } - return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, mxModel, xStyleProps ) ) ); + return uno::Any( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, mxModel, xStyleProps ) ) ); } else { diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index 0d228e6d883c..e09c89554ec9 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -120,7 +120,7 @@ uno::Any PrivateProfileStringListener::getValueEvent() sValue = OStringToOUString(aCfg.ReadKey(maKey), RTL_TEXTENCODING_DONTKNOW); - return uno::makeAny( sValue ); + return uno::Any( sValue ); } void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value ) @@ -253,7 +253,7 @@ SwVbaSystem::PrivateProfileString( const OUString& rFilename, const OUString& rS OString aKey(OUStringToOString(rKey, RTL_TEXTENCODING_DONTKNOW)); maPrivateProfileStringListener.Initialize( sFileUrl, aGroupName, aKey ); - return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) ); + return uno::Any( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) ); } OUString diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx index 501168abfcdb..67f812a6e2fe 100644 --- a/sw/source/ui/vba/vbatable.cxx +++ b/sw/source/ui/vba/vbatable.cxx @@ -54,7 +54,7 @@ SwVbaTable::Select( ) uno::Reference< view::XSelectionSupplier > xSelectionSupplier( xController, uno::UNO_QUERY_THROW ); // set the view cursor to the start of the table. - xSelectionSupplier->select( uno::makeAny( mxTextTable ) ); + xSelectionSupplier->select( uno::Any( mxTextTable ) ); // go to the end of the table and span the view uno::Reference< text::XTextViewCursor > xCursor = xViewCursorSupplier->getViewCursor(); @@ -84,7 +84,7 @@ SwVbaTable::Borders( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaBorders( this, mxContext, aCellRange, aPalette ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -94,7 +94,7 @@ SwVbaTable::Rows( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaRows( this, mxContext, mxTextTable, xTableRows ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } uno::Any SAL_CALL @@ -104,7 +104,7 @@ SwVbaTable::Columns( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaColumns( this, mxContext, mxTextTable, xTableColumns ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } // XHelperInterface diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx index 8c5fa066abe5..08cb11b7ec55 100644 --- a/sw/source/ui/vba/vbatableofcontents.cxx +++ b/sw/source/ui/vba/vbatableofcontents.cxx @@ -42,7 +42,7 @@ SwVbaTableOfContents::~SwVbaTableOfContents() void SAL_CALL SwVbaTableOfContents::setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) { - mxTocProps->setPropertyValue("Level", uno::makeAny( sal_Int8( _lowerheadinglevel ) ) ); + mxTocProps->setPropertyValue("Level", uno::Any( sal_Int8( _lowerheadinglevel ) ) ); } ::sal_Int32 SAL_CALL SwVbaTableOfContents::getTabLeader() @@ -65,7 +65,7 @@ sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields() void SAL_CALL SwVbaTableOfContents::setUseFields( sal_Bool _useFields ) { - mxTocProps->setPropertyValue("CreateFromMarks", uno::makeAny( _useFields ) ); + mxTocProps->setPropertyValue("CreateFromMarks", uno::Any( _useFields ) ); } sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() @@ -77,7 +77,7 @@ sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() void SAL_CALL SwVbaTableOfContents::setUseOutlineLevels( sal_Bool _useOutlineLevels ) { - mxTocProps->setPropertyValue("CreateFromOutline", uno::makeAny( _useOutlineLevels ) ); + mxTocProps->setPropertyValue("CreateFromOutline", uno::Any( _useOutlineLevels ) ); } void SAL_CALL SwVbaTableOfContents::Delete( ) diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 286bb25a8325..35b6f6173664 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -47,7 +47,7 @@ static uno::Any lcl_createTable( const uno::Reference< XHelperInterface >& xPare uno::Reference< text::XTextTable > xTextTable( aSource, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextDocument > xTextDocument( xDocument, uno::UNO_QUERY_THROW ); uno::Reference< word::XTable > xTable( new SwVbaTable( xParent, xContext, xTextDocument, xTextTable ) ); - return uno::makeAny( xTable ); + return uno::Any( xTable ); } static bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTable ) @@ -93,7 +93,7 @@ public: if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); uno::Reference< text::XTextTable > xTable( mxTables[ Index ], uno::UNO_SET_THROW ); - return uno::makeAny( xTable ); + return uno::Any( xTable ); } // XElementAccess virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<text::XTextTable>::get(); } @@ -104,7 +104,7 @@ public: if ( !hasByName(aName) ) throw container::NoSuchElementException(); uno::Reference< text::XTextTable > xTable( *cachePos, uno::UNO_SET_THROW ); - return uno::makeAny( xTable ); + return uno::Any( xTable ); } virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index c6cc23e6e155..b966e673e489 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -89,7 +89,7 @@ public: throw lang::IndexOutOfBoundsException(); uno::Reference< text::XDocumentIndex > xToc( maToc[Index], uno::UNO_SET_THROW ); - return uno::makeAny( uno::Reference< word::XTableOfContents >( new SwVbaTableOfContents( mxParent, mxContext, mxTextDocument, xToc ) ) ); + return uno::Any( uno::Reference< word::XTableOfContents >( new SwVbaTableOfContents( mxParent, mxContext, mxTextDocument, xToc ) ) ); } virtual uno::Type SAL_CALL getElementType( ) override { @@ -119,7 +119,7 @@ SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const u uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance("com.sun.star.text.ContentIndex"), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xTocProps( xDocumentIndex, uno::UNO_QUERY_THROW ); - xTocProps->setPropertyValue("IsProtected", uno::makeAny( false ) ); + xTocProps->setPropertyValue("IsProtected", uno::Any( false ) ); uno::Reference< word::XTableOfContents > xToc( new SwVbaTableOfContents( this, mxContext, mxTextDocument, xDocumentIndex ) ); diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index b790db76805b..ac93903cd901 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -40,7 +40,7 @@ static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< be /// @throws uno::RuntimeException static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq ) { - xParaProps->setPropertyValue("ParaTabStops", uno::makeAny( aSeq ) ); + xParaProps->setPropertyValue("ParaTabStops", uno::Any( aSeq ) ); } namespace { @@ -92,7 +92,7 @@ public: if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); - return uno::makeAny( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext ) ) ); + return uno::Any( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext ) ) ); } virtual uno::Type SAL_CALL getElementType( ) override { diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index 58059da512de..94cdcf56c12b 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -106,7 +106,7 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) uno::Reference< XCollection > xCol( new SwVbaAutoTextEntries( this, mxContext, xGroup ) ); if( index.hasValue() ) return xCol->Item( index, uno::Any() ); - return uno::makeAny( xCol ); + return uno::Any( xCol ); } OUString diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index 9e786e905028..33bc3c0c4612 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -73,7 +73,7 @@ SwVbaVariables::Add( const OUString& rName, const uno::Any& rValue ) uno::Reference< beans::XPropertyContainer > xPropertyContainer( mxUserDefined, uno::UNO_QUERY_THROW ); xPropertyContainer->addProperty( rName, beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::REMOVABLE, aValue ); - return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) ); + return uno::Any( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) ); } OUString diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index 4efeac437e81..cb3c40321935 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -197,7 +197,7 @@ SwVbaView::getTableGridLines() void SAL_CALL SwVbaView::setTableGridLines( sal_Bool _tablegridlines ) { - mxViewSettings->setPropertyValue("ShowTableBoundaries", uno::makeAny( _tablegridlines ) ); + mxViewSettings->setPropertyValue("ShowTableBoundaries", uno::Any( _tablegridlines ) ); } ::sal_Int32 SAL_CALL @@ -218,12 +218,12 @@ SwVbaView::setType( ::sal_Int32 _type ) case word::WdViewType::wdPrintView: case word::WdViewType::wdNormalView: { - mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::makeAny( false ) ); + mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::Any( false ) ); break; } case word::WdViewType::wdWebView: { - mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::makeAny( true ) ); + mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::Any( true ) ); break; } case word::WdViewType::wdPrintPreview: @@ -331,8 +331,8 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) xPageProps->getPropertyValue( aPropIsShared ) >>= isShared; if( !isOn ) { - xPageProps->setPropertyValue( aPropIsOn, uno::makeAny( true ) ); - xPageProps->setPropertyValue( aPropBodyDistance, uno::makeAny( DEFAULT_BODY_DISTANCE ) ); + xPageProps->setPropertyValue( aPropIsOn, uno::Any( true ) ); + xPageProps->setPropertyValue( aPropBodyDistance, uno::Any( DEFAULT_BODY_DISTANCE ) ); } if( !isShared ) { diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx index ed76ad494b31..1f5822efe2ca 100644 --- a/sw/source/ui/vba/vbawindow.cxx +++ b/sw/source/ui/vba/vbawindow.cxx @@ -62,7 +62,7 @@ SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument ) uno::Any SAL_CALL SwVbaWindow::getView() { - return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, m_xModel ) ) ); + return uno::Any( uno::Reference< word::XView >( new SwVbaView( this, mxContext, m_xModel ) ) ); } void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) @@ -89,7 +89,7 @@ SwVbaWindow::getWindowState() else if (pWork -> IsMinimized()) nwindowState = word::WdWindowState::wdWindowStateMinimize; } - return uno::makeAny( nwindowState ); + return uno::Any( nwindowState ); } void SAL_CALL @@ -141,7 +141,7 @@ SwVbaWindow::setCaption( const OUString& _caption ) if( !xFrameProps.is() ) return; - xFrameProps->setPropertyValue( "Title", uno::makeAny( _caption ) ); + xFrameProps->setPropertyValue( "Title", uno::Any( _caption ) ); } uno::Any SAL_CALL @@ -149,7 +149,7 @@ SwVbaWindow::Panes( const uno::Any& aIndex ) { uno::Reference< XCollection > xPanes( new SwVbaPanes( this, mxContext, m_xModel ) ); if( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) - return uno::makeAny( xPanes ); + return uno::Any( xPanes ); return xPanes->Item( aIndex, uno::Any() ); } @@ -157,7 +157,7 @@ SwVbaWindow::Panes( const uno::Any& aIndex ) uno::Any SAL_CALL SwVbaWindow::ActivePane() { - return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this, mxContext, m_xModel ) ) ); + return uno::Any( uno::Reference< word::XPane >( new SwVbaPane( this, mxContext, m_xModel ) ) ); } OUString diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index 0e77d3c58341..2aef0523b432 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -66,13 +66,13 @@ void SwVbaWrapFormat::makeWrap() case word::WdWrapType::wdWrapSquare: { eTextMode = text::WrapTextMode_PARALLEL; - m_xPropertySet->setPropertyValue("SurroundContour", uno::makeAny( false ) ); + m_xPropertySet->setPropertyValue("SurroundContour", uno::Any( false ) ); break; } case word::WdWrapType::wdWrapTight: { eTextMode = text::WrapTextMode_PARALLEL; - m_xPropertySet->setPropertyValue("SurroundContour", uno::makeAny( true ) ); + m_xPropertySet->setPropertyValue("SurroundContour", uno::Any( true ) ); break; } default: @@ -81,7 +81,7 @@ void SwVbaWrapFormat::makeWrap() } } } - m_xPropertySet->setPropertyValue("TextWrap", uno::makeAny( eTextMode ) ); + m_xPropertySet->setPropertyValue("TextWrap", uno::Any( eTextMode ) ); } ::sal_Int32 SAL_CALL SwVbaWrapFormat::getType() @@ -173,7 +173,7 @@ float SwVbaWrapFormat::getDistance( const OUString& sName ) void SwVbaWrapFormat::setDistance( const OUString& sName, float _distance ) { sal_Int32 nDistance = Millimeter::getInHundredthsOfOneMillimeter( _distance ); - m_xPropertySet->setPropertyValue( sName, uno::makeAny( nDistance ) ); + m_xPropertySet->setPropertyValue( sName, uno::Any( nDistance ) ); } float SAL_CALL SwVbaWrapFormat::getDistanceTop() diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index 7b916ccfde90..5bf7e26c771b 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -165,7 +165,7 @@ bool gotoSelectedObjectAnchor( const uno::Reference< frame::XModel>& xModel ) { uno::Reference< text::XTextRange > xTextRange( xTextContent->getAnchor(), uno::UNO_SET_THROW ); uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); - xSelectSupp->select( uno::makeAny( xTextRange ) ); + xSelectSupp->select( uno::Any( xTextRange ) ); isObjectSelected = true; } return isObjectSelected; |