diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/qa/core/uwriter.cxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/dochdl/gloshdl.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 4a123fc462eb..7de5c5d946c2 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -701,7 +701,7 @@ void SwDocTest::testSwScanner() const sal_Int32 nNextPos = aPaM.GetPoint()->nContent.GetIndex(); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(nPos+1), nNextPos); - SwFormatRefMark aRef(OUString("refmark")); + SwFormatRefMark aRef("refmark"); pTA = pTextNode->InsertItem(aRef, nNextPos, nNextPos); CPPUNIT_ASSERT(pTA); diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index da819d402a23..eb49924ee181 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -1816,7 +1816,7 @@ void SwUiWriterTest::testTdf78742() //testing with service type and any .ods file OUString path = m_directories.getURLFromSrc(DATA_DIRECTORY) + "calc-data-source.ods"; SfxMedium aMedium(path, StreamMode::READ | StreamMode::SHARE_DENYWRITE); - SfxFilterMatcher aMatcher(OUString("com.sun.star.text.TextDocument")); + SfxFilterMatcher aMatcher("com.sun.star.text.TextDocument"); std::shared_ptr<const SfxFilter> pFilter; sal_uInt32 filter = aMatcher.DetectFilter(aMedium, pFilter); CPPUNIT_ASSERT_EQUAL(ERRCODE_IO_ABORT, filter); @@ -1833,7 +1833,7 @@ void SwUiWriterTest::testTdf78742() //testing with service type and any .odt file OUString path2 = m_directories.getURLFromSrc(DATA_DIRECTORY) + "fdo69893.odt"; SfxMedium aMedium3(path2, StreamMode::READ | StreamMode::SHARE_DENYWRITE); - SfxFilterMatcher aMatcher3(OUString("com.sun.star.text.TextDocument")); + SfxFilterMatcher aMatcher3("com.sun.star.text.TextDocument"); std::shared_ptr<const SfxFilter> pFilter3; sal_uInt32 filter3 = aMatcher3.DetectFilter(aMedium3, pFilter3); CPPUNIT_ASSERT_EQUAL(ERRCODE_CLASS_NONE, filter3); diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 6522a92045af..c9cf78c2eac2 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -63,8 +63,8 @@ const OUString SwIoSystem::GetSubStorageName( const SfxFilter& rFltr ) std::shared_ptr<const SfxFilter> SwIoSystem::GetFilterOfFormat(const OUString& rFormatNm, const SfxFilterContainer* pCnt) { - SfxFilterContainer aCntSw( OUString(sSWRITER) ); - SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) ); + SfxFilterContainer aCntSw( sSWRITER ); + SfxFilterContainer aCntSwWeb( sSWRITERWEB ); const SfxFilterContainer* pFltCnt = pCnt ? pCnt : ( IsDocShellRegistered() ? &aCntSw : &aCntSwWeb ); do { @@ -143,8 +143,8 @@ bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter) // Returns the internal FilterName. std::shared_ptr<const SfxFilter> SwIoSystem::GetFileFilter(const OUString& rFileName) { - SfxFilterContainer aCntSw( OUString(sSWRITER) ); - SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) ); + SfxFilterContainer aCntSw( sSWRITER ); + SfxFilterContainer aCntSwWeb( sSWRITERWEB ); const SfxFilterContainer* pFCntnr = IsDocShellRegistered() ? &aCntSw : &aCntSwWeb; SfxFilterMatcher aMatcher( pFCntnr->GetName() ); diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index eea2fc3dd121..402af7f9dff0 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -706,7 +706,7 @@ bool SwGlossaryHdl::ImportGlossaries( const OUString& rName ) { std::shared_ptr<const SfxFilter> pFilter; std::unique_ptr<SfxMedium> pMed(new SfxMedium( rName, StreamMode::READ, nullptr, nullptr )); - SfxFilterMatcher aMatcher( OUString("swriter") ); + SfxFilterMatcher aMatcher( "swriter" ); pMed->UseInteractionHandler( true ); if (!aMatcher.GuessFilter(*pMed, pFilter, SfxFilterFlags::NONE)) { diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 9e25f428c9c1..f12fca5f1c9b 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1475,7 +1475,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe std::vector<beans::PropertyValue> aVector; sal_uInt16 nViewID( GetViewFrame()->GetCurViewId()); - OUStringBuffer sBuffer ( OUString( "view" ) ); + OUStringBuffer sBuffer( "view" ); ::sax::Converter::convertNumber(sBuffer, static_cast<sal_Int32>(nViewID)); aVector.push_back(comphelper::makePropertyValue("ViewId", sBuffer.makeStringAndClear())); |