summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--framework/source/uielement/menubarmanager.cxx3
-rw-r--r--sfx2/source/doc/docfile.cxx3
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx5
-rw-r--r--sw/source/filter/xml/xmlexpit.hxx11
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx4
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx4
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx3
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx3
9 files changed, 15 insertions, 23 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 2abd58434827..1f2c25ba085a 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1527,11 +1527,10 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sI
Reference< XStatusListener > xSubMenuManager( pSubMenuManager );
m_xFrame->addFrameActionListener( Reference< XFrameActionListener >( xSubMenuManager, UNO_QUERY ));
- Reference< XDispatch > xDispatch;
std::unique_ptr<MenuItemHandler> pMenuItemHandler(new MenuItemHandler(
_nItemId,
pSubMenuManager,
- xDispatch ));
+ Reference<XDispatch>() ));
pMenuItemHandler->aMenuItemURL = _sItemCommand;
m_aMenuItemHandlerVector.push_back( std::move(pMenuItemHandler) );
}
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 0cdbd884663b..282354795520 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3871,9 +3871,8 @@ void SfxMedium::AddVersion_Impl( util::RevisionTag& rRevision )
if ( aLongs[nKey] > nKey+1 )
break;
- OUString aRevName = "Version" + OUString::number( nKey + 1 );
+ rRevision.Identifier = "Version" + OUString::number( nKey + 1 );
pImpl->aVersions.realloc( nLength+1 );
- rRevision.Identifier = aRevName;
pImpl->aVersions.getArray()[nLength] = rRevision;
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 10db254a711f..20738c09967e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7429,11 +7429,10 @@ void DocxAttributeOutput::EmbedFontStyle( std::u16string_view name, int tag, Fon
xOutStream->writeBytes( uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( buffer ), readSize ));
}
xOutStream->closeOutput();
- OString relId = OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(),
+ EmbeddedFontRef ref;
+ ref.relId = OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(),
oox::getRelationship(Relationship::FONT),
Concat2View("fonts/font" + OUString::number( m_nextFontId ) + ".odttf") ), RTL_TEXTENCODING_UTF8 );
- EmbeddedFontRef ref;
- ref.relId = relId;
ref.fontKey = fontKeyStr;
m_FontFilesMap[ fontUrl ] = ref;
++m_nextFontId;
diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx
index b0e10fb0ab86..f4ad52ce8a38 100644
--- a/sw/source/filter/xml/xmlexpit.hxx
+++ b/sw/source/filter/xml/xmlexpit.hxx
@@ -82,19 +82,16 @@ public:
virtual void handleElementItem( const SvXMLItemMapEntry& rEntry,
const SfxPoolItem& rItem ) const;
- inline void setMapEntries( SvXMLItemMapEntriesRef rMapEntries );
+ void setMapEntries(const SvXMLItemMapEntriesRef& rMapEntries)
+ {
+ mrMapEntries = rMapEntries;
+ }
static bool QueryXMLValue( const SfxPoolItem& rItem,
OUString& rValue, sal_uInt16 nMemberId,
const SvXMLUnitConverter& rUnitConverter );
};
-inline void
-SvXMLExportItemMapper::setMapEntries( SvXMLItemMapEntriesRef rMapEntries )
-{
- mrMapEntries = rMapEntries;
-}
-
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index eaabf789e2ac..ec10f5c75629 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -72,9 +72,9 @@ SvXMLImportItemMapper::~SvXMLImportItemMapper()
}
void
-SvXMLImportItemMapper::setMapEntries( SvXMLItemMapEntriesRef rMapEntries )
+SvXMLImportItemMapper::setMapEntries(const SvXMLItemMapEntriesRef& rMapEntries)
{
- mrMapEntries = std::move(rMapEntries);
+ mrMapEntries = rMapEntries;
}
// fills the given itemset with the attributes in the given list
diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx
index 8227546a6253..5df248fac6a8 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -64,7 +64,7 @@ public:
virtual void finished(SfxItemSet & rSet,
SvXMLUnitConverter const& rUnitConverter) const;
- virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries );
+ virtual void setMapEntries(const SvXMLItemMapEntriesRef& rMapEntries);
inline const SvXMLItemMapEntriesRef& getMapEntries() const;
/** This method is called for every item that should be set based
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 9281604c4fd9..55ddfd8fb53f 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -66,7 +66,7 @@ public:
virtual void finished(SfxItemSet & rSet,
SvXMLUnitConverter const& rUnitConverter) const override;
- virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) override;
+ virtual void setMapEntries(const SvXMLItemMapEntriesRef& rMapEntries) override;
private:
void Reset();
@@ -95,7 +95,7 @@ void SwXMLImportTableItemMapper_Impl::Reset()
}
void SwXMLImportTableItemMapper_Impl::setMapEntries(
- SvXMLItemMapEntriesRef rMapEntries )
+ const SvXMLItemMapEntriesRef& rMapEntries)
{
Reset();
SvXMLImportItemMapper::setMapEntries(rMapEntries);
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 6755413796e4..de6cbfea2ef5 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -134,8 +134,7 @@ uno::Any
SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource )
{
uno::Reference< container::XNamed > xNamed( aSource, uno::UNO_QUERY_THROW );
- OUString aName = xNamed->getName();
- return uno::Any( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) );
+ return uno::Any(uno::Reference<word::XBookmark>(new SwVbaBookmark(getParent(), mxContext, mxModel, xNamed->getName())));
}
void SwVbaBookmarks::removeBookmarkByName( const OUString& rName )
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 322928eb4ead..4d9750a98602 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5422,8 +5422,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
// insert position at every cursor movement!
if( !rMyView.GetDocShell()->IsReadOnly() )
{
- vcl::Font aFont;
- SetInputContext( InputContext( aFont, InputContextFlags::Text |
+ SetInputContext( InputContext(vcl::Font(), InputContextFlags::Text |
InputContextFlags::ExtText ) );
}
}
generated by cgit (git 2.34.1) at 2025-01-27 05:45:33 +0000