diff options
Diffstat (limited to 'svtools/source/misc')
-rw-r--r-- | svtools/source/misc/acceleratorexecute.cxx | 58 | ||||
-rw-r--r-- | svtools/source/misc/bindablecontrolhelper.cxx | 22 | ||||
-rw-r--r-- | svtools/source/misc/ehdl.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/embedhlp.cxx | 6 | ||||
-rw-r--r-- | svtools/source/misc/embedtransfer.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/imagemgr.cxx | 12 | ||||
-rw-r--r-- | svtools/source/misc/imageresourceaccess.cxx | 6 | ||||
-rw-r--r-- | svtools/source/misc/langhelp.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/langtab.cxx | 4 | ||||
-rw-r--r-- | svtools/source/misc/openfiledroptargetlistener.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/sampletext.cxx | 8 | ||||
-rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 4 |
12 files changed, 64 insertions, 64 deletions
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 0d474f058ac0..24a4d365e894 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -312,65 +312,65 @@ OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey) switch( aKey.KeyCode ) { case css::awt::Key::DELETE_TO_BEGIN_OF_LINE: - return ".uno:DelToStartOfLine"; + return u".uno:DelToStartOfLine"_ustr; case css::awt::Key::DELETE_TO_END_OF_LINE: - return ".uno:DelToEndOfLine"; + return u".uno:DelToEndOfLine"_ustr; case css::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: - return ".uno:DelToStartOfPara"; + return u".uno:DelToStartOfPara"_ustr; case css::awt::Key::DELETE_TO_END_OF_PARAGRAPH: - return ".uno:DelToEndOfPara"; + return u".uno:DelToEndOfPara"_ustr; case css::awt::Key::DELETE_WORD_BACKWARD: - return ".uno:DelToStartOfWord"; + return u".uno:DelToStartOfWord"_ustr; case css::awt::Key::DELETE_WORD_FORWARD: - return ".uno:DelToEndOfWord"; + return u".uno:DelToEndOfWord"_ustr; case css::awt::Key::INSERT_LINEBREAK: - return ".uno:InsertLinebreak"; + return u".uno:InsertLinebreak"_ustr; case css::awt::Key::INSERT_PARAGRAPH: - return ".uno:InsertPara"; + return u".uno:InsertPara"_ustr; case css::awt::Key::MOVE_WORD_BACKWARD: - return ".uno:GoToPrevWord"; + return u".uno:GoToPrevWord"_ustr; case css::awt::Key::MOVE_WORD_FORWARD: - return ".uno:GoToNextWord"; + return u".uno:GoToNextWord"_ustr; case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: - return ".uno:GoToStartOfLine"; + return u".uno:GoToStartOfLine"_ustr; case css::awt::Key::MOVE_TO_END_OF_LINE: - return ".uno:GoToEndOfLine"; + return u".uno:GoToEndOfLine"_ustr; case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - return ".uno:GoToStartOfPara"; + return u".uno:GoToStartOfPara"_ustr; case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - return ".uno:GoToEndOfPara"; + return u".uno:GoToEndOfPara"_ustr; case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: - return ".uno:GoToStartOfDoc"; + return u".uno:GoToStartOfDoc"_ustr; case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: - return ".uno:GoToEndOfDoc"; + return u".uno:GoToEndOfDoc"_ustr; case css::awt::Key::SELECT_BACKWARD: - return ".uno:CharLeftSel"; + return u".uno:CharLeftSel"_ustr; case css::awt::Key::SELECT_FORWARD: - return ".uno:CharRightSel"; + return u".uno:CharRightSel"_ustr; case css::awt::Key::SELECT_WORD_BACKWARD: - return ".uno:WordLeftSel"; + return u".uno:WordLeftSel"_ustr; case css::awt::Key::SELECT_WORD_FORWARD: - return ".uno:WordRightSel"; + return u".uno:WordRightSel"_ustr; case css::awt::Key::SELECT_WORD: - return ".uno:SelectWord"; + return u".uno:SelectWord"_ustr; case css::awt::Key::SELECT_LINE: return OUString(); case css::awt::Key::SELECT_PARAGRAPH: - return ".uno:SelectText"; + return u".uno:SelectText"_ustr; case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: - return ".uno:StartOfLineSel"; + return u".uno:StartOfLineSel"_ustr; case css::awt::Key::SELECT_TO_END_OF_LINE: - return ".uno:EndOfLineSel"; + return u".uno:EndOfLineSel"_ustr; case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - return ".uno:StartOfParaSel"; + return u".uno:StartOfParaSel"_ustr; case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - return ".uno:EndOfParaSel"; + return u".uno:EndOfParaSel"_ustr; case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: - return ".uno:StartOfDocumentSel"; + return u".uno:StartOfDocumentSel"_ustr; case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: - return ".uno:EndOfDocumentSel"; + return u".uno:EndOfDocumentSel"_ustr; case css::awt::Key::SELECT_ALL: - return ".uno:SelectAll"; + return u".uno:SelectAll"_ustr; default: break; } diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx index ba5494975695..0d16c80008b7 100644 --- a/svtools/source/misc/bindablecontrolhelper.cxx +++ b/svtools/source/misc/bindablecontrolhelper.cxx @@ -46,7 +46,7 @@ static bool lcl_isNamedRange( const OUString& sAddress, const uno::Reference< fr try { uno::Reference< beans::XPropertySet > xPropSet( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( "NamedRanges" ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( u"NamedRanges"_ustr ), uno::UNO_QUERY_THROW ); xReferrer.set ( xNamed->getByName( sAddress ), uno::UNO_QUERY ); } catch( uno::Exception& /*e*/ ) @@ -81,15 +81,15 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference // RefCell - convert from XL // pretend we converted the imported string address into the // appropriate address structure - uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( "com.sun.star.table.CellAddressConversion"), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( u"com.sun.star.table.CellAddressConversion"_ustr), uno::UNO_QUERY ); css::table::CellAddress aAddress; if ( xConvertor.is() ) { // we need this service to properly convert XL notation also // Should be easy to extend - xConvertor->setPropertyValue( "ReferenceSheet", uno::Any( nRefTab ) ); - xConvertor->setPropertyValue( "XLA1Representation", uno::Any( rsCtrlSource ) ); - xConvertor->getPropertyValue( "Address" ) >>= aAddress; + xConvertor->setPropertyValue( u"ReferenceSheet"_ustr, uno::Any( nRefTab ) ); + xConvertor->setPropertyValue( u"XLA1Representation"_ustr, uno::Any( rsCtrlSource ) ); + xConvertor->getPropertyValue( u"Address"_ustr ) >>= aAddress; } beans::NamedValue aArg1; @@ -97,7 +97,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference aArg1.Value <<= aAddress; uno::Sequence< uno::Any > aArgs{ uno::Any(aArg1) }; - uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( "com.sun.star.table.CellValueBinding", aArgs ), uno::UNO_QUERY ); + uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( u"com.sun.star.table.CellValueBinding"_ustr, aArgs ), uno::UNO_QUERY ); xBindable->setValueBinding( xBinding ); } else if ( xBindable.is() ) // reset it @@ -110,7 +110,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference // RefCell - convert from XL // pretend we converted the imported string address into the // appropriate address structure - uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( "com.sun.star.table.CellRangeAddressConversion"), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( u"com.sun.star.table.CellRangeAddressConversion"_ustr), uno::UNO_QUERY ); css::table::CellRangeAddress aAddress; if ( xConvertor.is() ) { @@ -118,9 +118,9 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference { // we need this service to properly convert XL notation also // Should be easy to extend - xConvertor->setPropertyValue( "ReferenceSheet", uno::Any( nRefTab ) ); - xConvertor->setPropertyValue( "XLA1Representation", uno::Any( rsRowSource ) ); - xConvertor->getPropertyValue( "Address" ) >>= aAddress; + xConvertor->setPropertyValue( u"ReferenceSheet"_ustr, uno::Any( nRefTab ) ); + xConvertor->setPropertyValue( u"XLA1Representation"_ustr, uno::Any( rsRowSource ) ); + xConvertor->getPropertyValue( u"Address"_ustr ) >>= aAddress; } } @@ -129,7 +129,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference aArg1.Value <<= aAddress; uno::Sequence< uno::Any > aArgs{ uno::Any(aArg1) }; - uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( "com.sun.star.table.CellRangeListSource", aArgs ), uno::UNO_QUERY ); + uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( u"com.sun.star.table.CellRangeListSource"_ustr, aArgs ), uno::UNO_QUERY ); xListEntrySink->setListEntrySource( xSource ); } else if ( xListEntrySink.is() ) // reset diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 59613089a514..e740055a65df 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -62,7 +62,7 @@ static DialogMask aWndFunc( else if ( (nFlags & DialogMask::ButtonsYesNo) == DialogMask::ButtonsYesNo ) eButtonsType = VclButtonsType::YesNo; - OUString aErr("$(ACTION)$(ERROR)"); + OUString aErr(u"$(ACTION)$(ERROR)"_ustr); OUString aAction(rAction); if ( !aAction.isEmpty() ) aAction += ":\n"; diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 38321e843e0d..3bf114a2b97f 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -291,7 +291,7 @@ struct EmbeddedObjectRef_Impl mxObj->getComponent(), css::uno::UNO_QUERY); if (pComponent.is()) { - auto const s = pComponent->dump(""); + auto const s = pComponent->dump(u""_ustr); auto const s1 = OUStringToOString(s, RTL_TEXTENCODING_ISO_8859_1); //TODO (void)xmlTextWriterWriteRawLen( pWriter, reinterpret_cast<xmlChar const *>(s1.getStr()), s1.getLength()); @@ -742,7 +742,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const tools::Rectangle &rRect, con { MapMode aMM( MapUnit::MapAppFont ); Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, nullptr ); - vcl::Font aFnt( "Noto Sans", aAppFontSz ); + vcl::Font aFnt( u"Noto Sans"_ustr, aAppFontSz ); aFnt.SetTransparent( true ); aFnt.SetColor( COL_LIGHTRED ); aFnt.SetWeight( WEIGHT_BOLD ); @@ -1022,7 +1022,7 @@ OUString EmbeddedObjectRef::GetChartType() if( xProp.is()) { bool bCurrent = false; - if( xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bCurrent ) + if( xProp->getPropertyValue( u"SwapXAndYAxis"_ustr ) >>= bCurrent ) { if (bCurrent) Style += "Bars"; diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index 2d453425b493..233a1000c297 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -106,7 +106,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo if ( xPers.is() ) { uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetTemporaryStorage(); - OUString aName( "Dummy" ); + OUString aName( u"Dummy"_ustr ); SvStream* pStream = nullptr; bool bDeleteStream = false; uno::Sequence < beans::PropertyValue > aEmpty; diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 1e868c43e7ce..a1952bf26243 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -232,7 +232,7 @@ static OUString GetImageExtensionByFactory_Impl( const OUString& rURL ) // get the TypeDetection service to access all registered types css::uno::Reference < css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); css::uno::Reference < css::document::XTypeDetection > xTypeDetector( - xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", xContext), + xContext->getServiceManager()->createInstanceWithContext(u"com.sun.star.document.TypeDetection"_ustr, xContext), css::uno::UNO_QUERY ); OUString aInternalType = xTypeDetector->queryTypeByURL( rURL ); @@ -309,11 +309,11 @@ static bool GetVolumeProperties_Impl( ::ucbhelper::Content& rContent, svtools::V try { - bRet = ( ( rContent.getPropertyValue( "IsVolume" ) >>= rVolumeInfo.m_bIsVolume ) && - ( rContent.getPropertyValue( "IsRemote" ) >>= rVolumeInfo.m_bIsRemote ) && - ( rContent.getPropertyValue( "IsRemoveable" ) >>= rVolumeInfo.m_bIsRemoveable ) && - ( rContent.getPropertyValue( "IsFloppy" ) >>= rVolumeInfo.m_bIsFloppy ) && - ( rContent.getPropertyValue( "IsCompactDisc" ) >>= rVolumeInfo.m_bIsCompactDisc ) ); + bRet = ( ( rContent.getPropertyValue( u"IsVolume"_ustr ) >>= rVolumeInfo.m_bIsVolume ) && + ( rContent.getPropertyValue( u"IsRemote"_ustr ) >>= rVolumeInfo.m_bIsRemote ) && + ( rContent.getPropertyValue( u"IsRemoveable"_ustr ) >>= rVolumeInfo.m_bIsRemoveable ) && + ( rContent.getPropertyValue( u"IsFloppy"_ustr ) >>= rVolumeInfo.m_bIsFloppy ) && + ( rContent.getPropertyValue( u"IsCompactDisc"_ustr ) >>= rVolumeInfo.m_bIsCompactDisc ) ); } catch( const css::uno::RuntimeException& ) { diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 7a44a4d90dee..eef81ec52688 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -129,7 +129,7 @@ std::unique_ptr<SvStream> getImageStream(uno::Reference<uno::XComponentContext> // let it create a graphic from the given URL uno::Sequence<beans::PropertyValue> aMediaProperties{ comphelper::makePropertyValue( - "URL", rImageResourceURL) }; + u"URL"_ustr, rImageResourceURL) }; uno::Reference<graphic::XGraphic> xGraphic(xProvider->queryGraphic(aMediaProperties)); OSL_ENSURE(xGraphic.is(), "GraphicAccess::getImageStream: the provider did not give us a graphic object!"); @@ -142,8 +142,8 @@ std::unique_ptr<SvStream> getImageStream(uno::Reference<uno::XComponentContext> new OSeekableInputStreamWrapper(*pMemBuffer), new OSeekableOutputStreamWrapper(*pMemBuffer)); - aMediaProperties = { comphelper::makePropertyValue("OutputStream", xBufferAccess), - comphelper::makePropertyValue("MimeType", OUString("image/png")) }; + aMediaProperties = { comphelper::makePropertyValue(u"OutputStream"_ustr, xBufferAccess), + comphelper::makePropertyValue(u"MimeType"_ustr, u"image/png"_ustr) }; xProvider->storeGraphic(xGraphic, aMediaProperties); pMemBuffer->Seek(0); diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index afc6830fde54..3490aea5f09d 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -158,7 +158,7 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString } } if (locale.isEmpty()) - locale = getInstalledLocaleForLanguage(rLocaleElementNames, "en-US"); + locale = getInstalledLocaleForLanguage(rLocaleElementNames, u"en-US"_ustr); if (locale.isEmpty() && rLocaleElementNames.hasElements()) locale = rLocaleElementNames[0]; return locale; diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index a3ed27a3bdf2..dfacf5663e61 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -203,8 +203,8 @@ SvtLanguageTableImpl::SvtLanguageTableImpl() sal_Int32 nType = 0; uno::Reference <container::XNameAccess> xNB; xNA->getByName(rBcp47) >>= xNB; - bool bSuccess = (xNB->getByName("Name") >>= aName) && - (xNB->getByName("ScriptType") >>= nType); + bool bSuccess = (xNB->getByName(u"Name"_ustr) >>= aName) && + (xNB->getByName(u"ScriptType"_ustr) >>= nType); if (bSuccess) { LanguageTag aLang(rBcp47); diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx index 3c1552f0d91c..516636c564b5 100644 --- a/svtools/source/misc/openfiledroptargetlistener.cxx +++ b/svtools/source/misc/openfiledroptargetlistener.cxx @@ -201,7 +201,7 @@ void OpenFileDropTargetListener::implts_OpenFile( const OUString& rFilePath ) css::uno::Reference < css::frame::XDispatchProvider > xProvider( xTargetFrame, css::uno::UNO_QUERY ); // Create a new task or recycle an existing one - css::uno::Reference< css::frame::XDispatch > xDispatcher = xProvider->queryDispatch( aURL, "_default", 0 ); + css::uno::Reference< css::frame::XDispatch > xDispatcher = xProvider->queryDispatch( aURL, u"_default"_ustr, 0 ); if ( xDispatcher.is() ) xDispatcher->dispatch( aURL, css::uno::Sequence < css::beans::PropertyValue >() ); } diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 101d68362ad9..12e98cd769d7 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -1184,10 +1184,10 @@ namespace const std::map<UScriptCode, std::vector<OUString>> distCjkMap = { - { USCRIPT_KOREAN, { " KR", "Korean"} }, // Korean - { USCRIPT_JAPANESE, {" JP", "Japanese"} } , // Japanese - { USCRIPT_SIMPLIFIED_HAN, {" SC", " GB", "S Chinese"} }, // Simplified Chinese Family - { USCRIPT_TRADITIONAL_HAN, {" TC", " HC", " TW", " HK", " MO", "T Chinese"} }// Traditional Chinese Family + { USCRIPT_KOREAN, { u" KR"_ustr, u"Korean"_ustr} }, // Korean + { USCRIPT_JAPANESE, {u" JP"_ustr, u"Japanese"_ustr} } , // Japanese + { USCRIPT_SIMPLIFIED_HAN, {u" SC"_ustr, u" GB"_ustr, u"S Chinese"_ustr} }, // Simplified Chinese Family + { USCRIPT_TRADITIONAL_HAN, {u" TC"_ustr, u" HC"_ustr, u" TW"_ustr, u" HK"_ustr, u" MO"_ustr, u"T Chinese"_ustr} }// Traditional Chinese Family }; namespace { diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index d8e473350e10..57279a92b08d 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -532,8 +532,8 @@ namespace svt { // create a content for the current folder root Reference< XResultSet > xResultSet; - Sequence< OUString > aContentProperties{ "Title", "DateModified", "DateCreated", - "IsFolder" }; + Sequence< OUString > aContentProperties{ u"Title"_ustr, u"DateModified"_ustr, u"DateCreated"_ustr, + u"IsFolder"_ustr }; // get the set of sub contents in the folder try |