diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-06-29 21:24:12 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-06-29 21:52:54 +0000 |
commit | ba0a57702cdef7a0389c06841711d7e3079d471c (patch) | |
tree | 223c0dd50de4b71cf7df9d0073f7cacca1f18c8d /sfx2 | |
parent | 8a7ede404ca4980f169c4ce634805ea5c1b6b56e (diff) |
remove OUString wrap for string literals
For some functions and all kinds of Exceptions.
CannotConvertException
CloseVetoException
DisposedException
EmptyUndoStackException
ErrorCodeIOException
Exception
GridInvalidDataException
GridInvalidModelException
IOException
IllegalAccessException
IllegalArgumentException
IllegalTypeException
IndexOutOfBoundsException
NoMasterException
NoSuchElementException
NoSupportException
PropertyVetoException
RuntimeException
SAXException
ScannerException
StorageWrappedTargetException
UnsupportedFlavorException
VetoException
WrappedTargetException
ZipIOException
throwGenericSQLException
throwIllegallArgumentException
createInstance
createInstanceWithContext
forName
getByName
getPackageManager
getPropertyValue
getUnpackedValueOrDefault
getValueByName
hasPropertyByName
openKey
setName
setPropertyValue
supportsService
bash command:
for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx'
| cut -d ':' -f1 | sort -u
| xargs sed -i
-e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g"
-e "s/\($i.*\)\"+ /\1\" + /g";
done
Change-Id: Iaf8e641b0abf28c082906014f87a183517630535
Reviewed-on: https://gerrit.libreoffice.org/4624
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sfx2')
25 files changed, 88 insertions, 88 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index b3ffefdd6ffa..3c128351423c 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -237,7 +237,7 @@ sal_uInt32 CheckPasswd_Impl { sal_Bool bIsEncrypted = sal_False; try { - xStorageProps->getPropertyValue( OUString("HasEncryptedEntries") ) + xStorageProps->getPropertyValue("HasEncryptedEntries") >>= bIsEncrypted; } catch( uno::Exception& ) { @@ -914,7 +914,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( xSet.is() ) { // copy protocols - aRet = xSet->getPropertyValue( OUString("Protocols") ); + aRet = xSet->getPropertyValue("Protocols"); Sequence < OUString > aTmp; aRet >>= aTmp; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 1fdd6c1041ef..b83a9bf7ee47 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -653,7 +653,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) { try { - Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } catch ( const ::com::sun::star::uno::RuntimeException& ) diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index cd0676159005..4fecc9ef2c4e 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -177,7 +177,7 @@ sal_Bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ), Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - if ( ( aCnt.getPropertyValue( OUString("AnchorName") ) >>= sAnchor ) ) + if ( ( aCnt.getPropertyValue("AnchorName") >>= sAnchor ) ) { if ( !sAnchor.isEmpty() ) @@ -435,7 +435,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , if (xHelpTask->setComponent( xHelpWindow, Reference< XController >() )) { // Customize UI ... - xHelpTask->setName( OUString("OFFICE_HELP_TASK") ); + xHelpTask->setName("OFFICE_HELP_TASK"); Reference< XPropertySet > xProps(xHelpTask, UNO_QUERY); if (xProps.is()) @@ -458,7 +458,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , return NULL; } - xHelpContent->setName(OUString("OFFICE_HELP")); + xHelpContent->setName("OFFICE_HELP"); rHelpTask = xHelpTask; rHelpContent = xHelpContent; diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index e822d9d7dc0d..dd46236c1365 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -254,7 +254,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( { OStringBuffer sOut; OUString aStr; - uno::Any aAny = xSet->getPropertyValue( OUString("FrameURL") ); + uno::Any aAny = xSet->getPropertyValue("FrameURL"); if ( (aAny >>= aStr) && !aStr.isEmpty() ) { String aURL = INetURLObject( aStr ).GetMainURL( INetURLObject::DECODE_TO_IURI ); @@ -270,7 +270,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } } - aAny = xSet->getPropertyValue( OUString("FrameName") ); + aAny = xSet->getPropertyValue("FrameName"); if ( (aAny >>= aStr) && !aStr.isEmpty() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name) @@ -281,13 +281,13 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } sal_Int32 nVal = SIZE_NOT_SET; - aAny = xSet->getPropertyValue( OUString("FrameMarginWidth") ); + aAny = xSet->getPropertyValue("FrameMarginWidth"); if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginwidth) .append('=').append(nVal); } - aAny = xSet->getPropertyValue( OUString("FrameMarginHeight") ); + aAny = xSet->getPropertyValue("FrameMarginHeight"); if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginheight) @@ -295,10 +295,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } sal_Bool bVal = sal_True; - aAny = xSet->getPropertyValue( OUString("FrameIsAutoScroll") ); + aAny = xSet->getPropertyValue("FrameIsAutoScroll"); if ( (aAny >>= bVal) && !bVal ) { - aAny = xSet->getPropertyValue( OUString("FrameIsScrollingMode") ); + aAny = xSet->getPropertyValue("FrameIsScrollingMode"); if ( aAny >>= bVal ) { const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no; @@ -308,10 +308,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } // frame border (MS+Netscape-Extension) - aAny = xSet->getPropertyValue( OUString("FrameIsAutoBorder") ); + aAny = xSet->getPropertyValue("FrameIsAutoBorder"); if ( (aAny >>= bVal) && !bVal ) { - aAny = xSet->getPropertyValue( OUString("FrameIsBorder") ); + aAny = xSet->getPropertyValue("FrameIsBorder"); if ( aAny >>= bVal ) { const char* pStr = bVal ? sHTML_SC_yes : sHTML_SC_no; diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 9acf705ee3be..9053ab381d2b 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -217,7 +217,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest if ( xSet.is() ) { - com::sun::star::uno::Any aProp = xSet->getPropertyValue(OUString("DispatchRecorderSupplier")); + com::sun::star::uno::Any aProp = xSet->getPropertyValue("DispatchRecorderSupplier"); com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder; aProp >>= xSupplier; @@ -1250,7 +1250,7 @@ void SfxDispatcher::SetMenu_Impl() if ( xPropSet.is() ) { com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) { @@ -1314,7 +1314,7 @@ void SfxDispatcher::Update_Impl( sal_Bool bForce ) { try { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) ); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } catch (const com::sun::star::uno::Exception&) @@ -2160,7 +2160,7 @@ void SfxDispatcher::HideUI( sal_Bool bHide ) if ( xPropSet.is() ) { com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) xLayoutManager->setVisible( !bHide ); diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 3fa185592ed5..a95b59f10840 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -815,7 +815,7 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe if(xSet.is()) { - com::sun::star::uno::Any aProp = xSet->getPropertyValue(OUString("DispatchRecorderSupplier")); + com::sun::star::uno::Any aProp = xSet->getPropertyValue("DispatchRecorderSupplier"); com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; aProp >>= xSupplier; if(xSupplier.is()) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index d11cdf920aab..c00d384093b7 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1805,7 +1805,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory, uno::Reference< XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); uno::Reference< XContainerQuery > xFilterCont( - xSMGR->createInstance(OUString("com.sun.star.document.FilterFactory")), + xSMGR->createInstance("com.sun.star.document.FilterFactory"), UNO_QUERY); if ( ! xFilterCont.is() ) return; diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 8df390fd1f20..7943e6606957 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -148,7 +148,7 @@ sal_Bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XMode css::uno::Reference< css::beans::XPropertySet > xPropSet( xModel, css::uno::UNO_QUERY ); if ( xPropSet.is() ) { - Any a = xPropSet->getPropertyValue( OUString( "HasValidSignatures" )); + Any a = xPropSet->getPropertyValue("HasValidSignatures"); sal_Bool bReturn = sal_Bool(); if ( a >>= bReturn ) return bReturn; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 3d81345f8767..c1d3b1714a4d 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2768,18 +2768,18 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) try { uno::Sequence< beans::PropertyValue > aPropSeq; - uno::Any aCommand = xUICommands->getByName(OUString(".uno:StyleNewByExample")); + uno::Any aCommand = xUICommands->getByName(".uno:StyleNewByExample"); OUString sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel ); pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE); - aCommand = xUICommands->getByName(OUString(".uno:StyleUpdateByExample")); + aCommand = xUICommands->getByName(".uno:StyleUpdateByExample"); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel ); pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE); - aCommand = xUICommands->getByName(OUString(".uno:LoadStyles")); + aCommand = xUICommands->getByName(".uno:LoadStyles"); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel ); pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles"); diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index d83b1950dc7d..f410703ed421 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -1907,7 +1907,7 @@ SfxDocumentMetaData::loadFromStorage( css::uno::Reference<css::beans::XPropertySet> xPropArg = getURLProperties(Medium); try { - xPropArg->getPropertyValue(OUString("BaseURI")) + xPropArg->getPropertyValue("BaseURI") >>= input.sSystemId; input.sSystemId += OUString("/").concat( OUString(s_meta)); diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 574bc54603a6..932b1a9209e3 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -241,7 +241,7 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri aActuralFilterData[nInd].Value >>= aActualFilterTypeName; ::comphelper::SequenceAsHashMap aProps1( xTypeDetection->getByName( aActualFilterTypeName ) ); uno::Sequence< OUString > aAllExt = - aProps1.getUnpackedValueOrDefault( OUString("Extensions"), uno::Sequence< OUString >() ); + aProps1.getUnpackedValueOrDefault("Extensions", uno::Sequence< OUString >() ); //To-do: check if aAllExt is empty first OUString aExt = aAllExt[0]; @@ -269,7 +269,7 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri uno::Reference< document::XTypeDetection > xTypeDetector( xTypeDetection, uno::UNO_QUERY ); ::comphelper::SequenceAsHashMap aProps2( xTypeDetection->getByName( xTypeDetector->queryTypeByURL( rTemplateName ) ) ); OUString aFilterName = - aProps2.getUnpackedValueOrDefault( OUString("PreferredFilter"), OUString() ); + aProps2.getUnpackedValueOrDefault("PreferredFilter", OUString() ); uno::Sequence< beans::PropertyValue > aArgs( 3 ); aArgs[0].Name = OUString("FilterName"); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index e44449f5be65..25af1e48b852 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -475,7 +475,7 @@ util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue ) uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext() ); - aContent.getPropertyValue( OUString("DateModified" ) ) >>= pImp->m_aDateTime; + aContent.getPropertyValue("DateModified") >>= pImp->m_aDateTime; pImp->m_bGotDateTime = true; } catch ( const ::com::sun::star::uno::Exception& ) @@ -535,7 +535,7 @@ OUString SfxMedium::GetBaseURL( bool bForSaving ) { try { - Any aAny = pImp->aContent.getPropertyValue( OUString("BaseURI" ) ); + Any aAny = pImp->aContent.getPropertyValue("BaseURI"); aAny >>= aBaseURL; } catch ( const ::com::sun::star::uno::Exception& ) @@ -1050,7 +1050,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) // MediaDescriptor does this check also, the duplication should be avoided in future Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext() ); - aContent.getPropertyValue( OUString( "IsReadOnly" ) ) >>= bContentReadonly; + aContent.getPropertyValue("IsReadOnly") >>= bContentReadonly; } catch( const uno::Exception& ) {} @@ -1895,7 +1895,7 @@ void SfxMedium::Transfer_Impl() aAny <<= pSegmentSize->GetValue(); uno::Reference < beans::XPropertySet > xSet( pImp->xStorage, uno::UNO_QUERY ); - xSet->setPropertyValue( OUString("SegmentSize"), aAny ); + xSet->setPropertyValue("SegmentSize", aAny ); // copy the temporary storage into the disk spanned package GetStorage()->copyToStorage( xStor ); @@ -1974,7 +1974,7 @@ void SfxMedium::Transfer_Impl() // LongName wasn't defined anywhere, only used here... get the Title instead // as it's less probably empty OUString aFileName; - Any aAny = aDestContent.getPropertyValue( OUString("Title" ) ); + Any aAny = aDestContent.getPropertyValue("Title"); aAny >>= aFileName; if ( aFileName.isEmpty() ) aFileName = GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); @@ -3098,7 +3098,7 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() { try { - Any aAny = pImp->aContent.getPropertyValue( OUString("MediaType") ); + Any aAny = pImp->aContent.getPropertyValue("MediaType"); OUString aContentType; aAny >>= aContentType; diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 2d162b211cc3..0ba7deddd46d 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -1377,7 +1377,7 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& uno::UNO_QUERY_THROW ); OUString aTempURL; - uno::Any aUrl = xTempFile->getPropertyValue( OUString("Uri") ); + uno::Any aUrl = xTempFile->getPropertyValue("Uri"); aUrl >>= aTempURL; uno::Reference< io::XStream > xStream( xTempFile, uno::UNO_QUERY_THROW ); @@ -1835,14 +1835,14 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, if ( !xApplConfig.is() ) throw uno::RuntimeException(); - xApplConfig->getByName( OUString( "ooSetupFactoryActualTemplateFilter" ) ) >>= aFilterName; + xApplConfig->getByName("ooSetupFactoryActualTemplateFilter") >>= aFilterName; if ( aFilterName.isEmpty() ) throw uno::RuntimeException(); // find the related type name OUString aTypeName; uno::Reference< container::XNameAccess > xFilterFactory( - xFactory->createInstance( OUString("com.sun.star.document.FilterFactory") ), + xFactory->createInstance("com.sun.star.document.FilterFactory"), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aFilterData; @@ -1861,16 +1861,16 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, mxType.is() ? uno::Reference< container::XNameAccess >( mxType, uno::UNO_QUERY_THROW ) : uno::Reference< container::XNameAccess >( - xFactory->createInstance( OUString("com.sun.star.document.TypeDetection") ), + xFactory->createInstance("com.sun.star.document.TypeDetection"), uno::UNO_QUERY_THROW ); SequenceAsHashMap aTypeProps( xTypeDetection->getByName( aTypeName ) ); uno::Sequence< OUString > aAllExt = - aTypeProps.getUnpackedValueOrDefault( OUString("Extensions"), Sequence< OUString >() ); + aTypeProps.getUnpackedValueOrDefault("Extensions", Sequence< OUString >() ); if ( !aAllExt.getLength() ) throw uno::RuntimeException(); - OUString aMediaType = aTypeProps.getUnpackedValueOrDefault( OUString("MediaType"), OUString() ); + OUString aMediaType = aTypeProps.getUnpackedValueOrDefault("MediaType", OUString() ); OUString aExt = aAllExt[0]; if ( aMediaType.isEmpty() || aExt.isEmpty() ) diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index a2701549606a..9df4e68de3f7 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -461,7 +461,7 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetModuleProps() //------------------------------------------------------------------------- OUString ModelData_Impl::GetDocServiceName() { - return GetModuleProps().getUnpackedValueOrDefault(OUString("ooSetupFactoryDocumentService"), OUString()); + return GetModuleProps().getUnpackedValueOrDefault("ooSetupFactoryDocumentService", OUString()); } //------------------------------------------------------------------------- @@ -510,7 +510,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter if ( aProps.getLength() ) { ::comphelper::SequenceAsHashMap aFiltHM( aProps ); - sal_Int32 nFlags = aFiltHM.getUnpackedValueOrDefault( OUString("Flags"), + sal_Int32 nFlags = aFiltHM.getUnpackedValueOrDefault("Flags", (sal_Int32)0 ); if ( ( ( nFlags & nMust ) == nMust ) && !( nFlags & nDont ) ) aFilterProps = aProps; @@ -768,13 +768,13 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps; aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps ); - nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); + nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault("Flags", (sal_Int32)0 ); } // only a temporary solution until default filter retrieving feature is implemented // then GetDocServiceDefaultFilter() must be used ::comphelper::SequenceAsHashMap aDefFiltPropsHM = GetDocServiceDefaultFilterCheckFlags( 3, 0 ); - sal_Int32 nDefFiltFlags = aDefFiltPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); + sal_Int32 nDefFiltFlags = aDefFiltPropsHM.getUnpackedValueOrDefault("Flags", (sal_Int32)0 ); // if the old filter is not acceptable // and there is no default filter or it is not acceptable for requested parameters then proceed with saveAs @@ -794,9 +794,9 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) { // the default filter is acceptable and the old filter is alian one // so ask to make a saveAs operation - OUString aUIName = aFiltPropsHM.getUnpackedValueOrDefault( OUString("UIName"), + OUString aUIName = aFiltPropsHM.getUnpackedValueOrDefault("UIName", OUString() ); - OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( OUString("UIName"), + OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault("UIName", OUString() ); OUString aPreusedFilterName = GetDocProps().getUnpackedValueOrDefault( OUString("PreusedFilterName"), @@ -1014,7 +1014,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, m_pOwner->GetFilterConfiguration()->getByName( aOldFilterName ) >>= aOldFilterProps; ::comphelper::SequenceAsHashMap aOldFiltPropsHM( aOldFilterProps ); - sal_Int32 nOldFiltFlags = aOldFiltPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); + sal_Int32 nOldFiltFlags = aOldFiltPropsHM.getUnpackedValueOrDefault("Flags", (sal_Int32)0 ); if ( bSetStandardName || ( nOldFiltFlags & nMust ) != nMust || nOldFiltFlags & nDont ) { @@ -1225,7 +1225,7 @@ OUString ModelData_Impl::GetRecommendedDir( const OUString& aSuggestedDir ) OUString aRecommendedDir; if ( ( !aSuggestedDir.isEmpty() || GetStorable()->hasLocation() ) - && !GetMediaDescr().getUnpackedValueOrDefault( OUString("RepairPackage"), + && !GetMediaDescr().getUnpackedValueOrDefault("RepairPackage", sal_False ) ) { INetURLObject aLocation; @@ -1280,7 +1280,7 @@ OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, con { // adjust the extension to the type uno::Reference< container::XNameAccess > xTypeDetection = uno::Reference< container::XNameAccess >( - comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.document.TypeDetection") ), + comphelper::getProcessServiceFactory()->createInstance("com.sun.star.document.TypeDetection"), uno::UNO_QUERY ); if ( xTypeDetection.is() ) { @@ -1320,7 +1320,7 @@ uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguratio if ( !m_xFilterCFG.is() ) { m_xFilterCFG = uno::Reference< container::XNameAccess >( - comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.document.FilterFactory") ), + comphelper::getProcessServiceFactory()->createInstance("com.sun.star.document.FilterFactory"), uno::UNO_QUERY ); if ( !m_xFilterCFG.is() ) @@ -1533,17 +1533,17 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel } // The Dispatch supports parameter FolderName that overwrites SuggestedSaveAsDir - OUString aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( OUString( "FolderName" ), OUString() ); + OUString aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault("FolderName", OUString() ); if ( aSuggestedDir.isEmpty() ) { - aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsDir" ), OUString() ); + aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault("SuggestedSaveAsDir", OUString() ); if ( aSuggestedDir.isEmpty() ) - aSuggestedDir = aModelData.GetDocProps().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsDir" ), OUString() ); + aSuggestedDir = aModelData.GetDocProps().getUnpackedValueOrDefault("SuggestedSaveAsDir", OUString() ); } - aSuggestedName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsName" ), OUString() ); + aSuggestedName = aModelData.GetMediaDescr().getUnpackedValueOrDefault("SuggestedSaveAsName", OUString() ); if ( aSuggestedName.isEmpty() ) - aSuggestedName = aModelData.GetDocProps().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsName" ), OUString() ); + aSuggestedName = aModelData.GetDocProps().getUnpackedValueOrDefault("SuggestedSaveAsName", OUString() ); OUString sStandardDir; ::comphelper::SequenceAsHashMap::const_iterator aStdDirIter = diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index d8f4319163fa..71b6763717e4 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1108,9 +1108,9 @@ void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteract try { uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; - xPropSet->getPropertyValue( OUString( "HasEncryptedEntries" ) ) >>= bIsEncrypted; - xPropSet->getPropertyValue( OUString( "HasNonEncryptedEntries" ) ) >>= bHasNonEncrypted; + xPropSet->getPropertyValue("Version") >>= aVersion; + xPropSet->getPropertyValue("HasEncryptedEntries") >>= bIsEncrypted; + xPropSet->getPropertyValue("HasNonEncryptedEntries") >>= bHasNonEncrypted; } catch( uno::Exception& ) { @@ -1561,7 +1561,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon { Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] = *pCaller; - xProps->setPropertyValue( OUString("Caller"), uno::makeAny( aArgs ) ); + xProps->setPropertyValue("Caller", uno::makeAny( aArgs ) ); } } aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam ); @@ -1962,7 +1962,7 @@ sal_Bool SfxObjectShell_Impl::hasTrustedScriptingSignature( sal_Bool bAllowUIToA try { uno::Reference < beans::XPropertySet > xPropSet( rDocShell.GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue("Version") >>= aVersion; } catch( uno::Exception& ) { diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 5549414df17e..bff362c066cd 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1330,7 +1330,7 @@ uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::ImplAnal try { uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue("Version") >>= aVersion; } catch( uno::Exception& ) { @@ -1408,7 +1408,7 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent ) { // check the version of the document uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aODFVersion; + xPropSet->getPropertyValue("Version") >>= aODFVersion; } catch( uno::Exception& ) {} diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 29d9d2d44266..ffdb470f4cfd 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -363,7 +363,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto { try { - xProps->setPropertyValue( OUString("MediaType"), uno::makeAny( aDataFlavor.MimeType ) ); + xProps->setPropertyValue("MediaType", uno::makeAny( aDataFlavor.MimeType ) ); } catch( uno::Exception& ) { @@ -387,7 +387,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto try { // older versions can not have this property set, it exists only starting from ODF1.2 - xProps->setPropertyValue( OUString("Version" ), uno::makeAny( ODFVER_012_TEXT ) ); + xProps->setPropertyValue("Version", uno::makeAny( ODFVER_012_TEXT ) ); } catch( uno::Exception& ) { @@ -444,7 +444,7 @@ sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage try { uno::Reference < beans::XPropertySet > xPropSet( xStorage, uno::UNO_QUERY_THROW ); - Any a = xPropSet->getPropertyValue( OUString("MediaType" ) ); + Any a = xPropSet->getPropertyValue("MediaType"); OUString aMediaType; if ( !(a>>=aMediaType) || aMediaType.isEmpty() ) { @@ -680,7 +680,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) // treat the package as broken if the mediatype was retrieved as a fallback uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW ); - xStorProps->getPropertyValue( OUString( "MediaTypeFallbackUsed" ) ) + xStorProps->getPropertyValue("MediaTypeFallbackUsed") >>= bWarnMediaTypeFallback; if ( pRepairPackageItem && pRepairPackageItem->GetValue() ) @@ -876,7 +876,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo if( xServiceManager.is() ) { xFilterCFG = com::sun::star::uno::Reference< XNameAccess >( - xServiceManager->createInstance( OUString("com.sun.star.document.FilterFactory") ), + xServiceManager->createInstance("com.sun.star.document.FilterFactory"), UNO_QUERY ); } @@ -1161,7 +1161,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl try { uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aODFVersion; + xPropSet->getPropertyValue("Version") >>= aODFVersion; } catch( uno::Exception& ) {} @@ -1349,7 +1349,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl if ( !xProps.is() ) throw uno::RuntimeException(); - xProps->setPropertyValue( OUString("MediaType"), + xProps->setPropertyValue("MediaType", uno::makeAny( aDataFlavor.MimeType ) ); } catch( uno::Exception& ) @@ -1578,7 +1578,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl try { uno::Reference < beans::XPropertySet > xPropSet( rMedium.GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue("Version") >>= aVersion; } catch( uno::Exception& ) { @@ -1895,7 +1895,7 @@ sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit ) uno::Reference < beans::XPropertySet > xPropSet( xNewStor, uno::UNO_QUERY ); if ( xPropSet.is() ) { - Any a = xPropSet->getPropertyValue( OUString("MediaType" ) ); + Any a = xPropSet->getPropertyValue("MediaType"); OUString aMediaType; if ( !(a>>=aMediaType) || aMediaType.isEmpty() ) { @@ -3558,7 +3558,7 @@ sal_Bool SfxObjectShell::WriteThumbnail( sal_Bool bEncrypted, uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY ); if ( xSet.is() ) - xSet->setPropertyValue( OUString("MediaType"), + xSet->setPropertyValue("MediaType", uno::makeAny( OUString("image/png") ) ); if ( bEncrypted ) { diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 64e5b4314721..2c2d58aa50d4 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -137,7 +137,7 @@ OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent ) if( xProps.is() ) try { OUString aConstName; - xProps->getPropertyValue( OUString( "ThisVBADocObj" ) ) >>= aConstName; + xProps->getPropertyValue("ThisVBADocObj") >>= aConstName; return OUStringToOString( aConstName, RTL_TEXTENCODING_ASCII_US ); } catch (const uno::Exception&) // not supported diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 07857565212c..9a59132ccdf9 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -136,9 +136,9 @@ throw( uno::RuntimeException ) uno::Reference< beans::XPropertySet > xProp( xModel, ::uno::UNO_QUERY ); if( xProp.is() ) { - uno::Any aValue = xProp->getPropertyValue( OUString( "URL" ) ); + uno::Any aValue = xProp->getPropertyValue("URL"); aValue >>= maURL; - aValue = xProp->getPropertyValue( OUString( "TYPE" ) ); + aValue = xProp->getPropertyValue("TYPE"); aValue >>= maMimeType; } } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index b8d5790d8e17..210dd73c03aa 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -2462,7 +2462,7 @@ void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< docume void SAL_CALL SfxBaseModel::notifyDocumentEvent( const OUString&, const Reference< frame::XController2 >&, const Any& ) throw ( lang::IllegalArgumentException, lang::NoSupportException, RuntimeException ) { - throw lang::NoSupportException( OUString( "SfxBaseModel controlls all the sent notifications itself!" ), Reference< XInterface >() ); + throw lang::NoSupportException("SfxBaseModel controlls all the sent notifications itself!", Reference< XInterface >() ); } Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getCmisPropertiesValues() @@ -2980,10 +2980,10 @@ void SfxBaseModel::impl_store( const OUString& sURL m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Can't store shared document!" ) ); m_pData->m_pObjectShell->StoreLog(); - uno::Sequence< beans::NamedValue > aNewEncryptionData = aArgHash.getUnpackedValueOrDefault( OUString( "EncryptionData" ), uno::Sequence< beans::NamedValue >() ); + uno::Sequence< beans::NamedValue > aNewEncryptionData = aArgHash.getUnpackedValueOrDefault("EncryptionData", uno::Sequence< beans::NamedValue >() ); if ( !aNewEncryptionData.getLength() ) { - OUString aNewPassword = aArgHash.getUnpackedValueOrDefault( OUString( "Password" ), OUString() ); + OUString aNewPassword = aArgHash.getUnpackedValueOrDefault("Password", OUString() ); aNewEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( aNewPassword ); } @@ -2995,7 +2995,7 @@ void SfxBaseModel::impl_store( const OUString& sURL else { // if the password is changed a special error should be used in case of shared document - throw task::ErrorCodeIOException( OUString( "Cant change password for shared document." ), uno::Reference< uno::XInterface >(), ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ); + throw task::ErrorCodeIOException("Cant change password for shared document.", uno::Reference< uno::XInterface >(), ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ); } } #endif diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index e5b188b3c592..a6140b7363ac 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -702,7 +702,7 @@ throw (::com::sun::star::uno::RuntimeException) { try { - xPropSet->getPropertyValue( OUString( "ResourceURL" )) >>= aSubToolBarResName; + xPropSet->getPropertyValue("ResourceURL") >>= aSubToolBarResName; } catch ( com::sun::star::beans::UnknownPropertyException& ) { @@ -752,7 +752,7 @@ throw (::com::sun::star::uno::RuntimeException) xLayoutManager->setElementPos( aSubToolBarResName, aEvent.FloatingPosition ); xLayoutManager->showElement( aSubToolBarResName ); - xProp->setPropertyValue( OUString( "Persistent" ), a ); + xProp->setPropertyValue("Persistent", a ); } } catch ( ::com::sun::star::uno::RuntimeException& ) diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index bacba1ce0d3f..c9c4d350c667 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -326,7 +326,7 @@ void SfxFrame::SetPresentationMode( sal_Bool bSet ) if ( xPropSet.is() ) { - Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } @@ -378,7 +378,7 @@ void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn ) if ( xPropSet.is() ) { - Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 9816437de6b1..6e22e9470a6d 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -376,7 +376,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const la pShell->TakeFrameOwnership_Impl(); } - throw util::CloseVetoException(OUString("Controller disagree ..."),static_cast< ::cppu::OWeakObject*>(this)); + throw util::CloseVetoException("Controller disagree ...",static_cast< ::cppu::OWeakObject*>(this)); } } } @@ -1260,8 +1260,8 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) { Reference< beans::XPropertySet > xFrameProps( m_pData->m_xFrame, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySet > xLayouterProps( - xFrameProps->getPropertyValue( OUString( "LayoutManager" ) ), uno::UNO_QUERY_THROW ); - xLayouterProps->setPropertyValue( OUString( "PreserveContentSize" ), uno::makeAny( sal_True ) ); + xFrameProps->getPropertyValue("LayoutManager"), uno::UNO_QUERY_THROW ); + xLayouterProps->setPropertyValue("PreserveContentSize", uno::makeAny( sal_True ) ); } catch (const uno::Exception&) { diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 97f9344c1678..8768d788c918 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2868,7 +2868,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { try { - Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } catch ( Exception& ) @@ -2922,7 +2922,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { try { - Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } catch ( Exception& ) diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 0f58a322dfe0..fa00d8b09012 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -456,7 +456,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { try { - Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) { |