diff options
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/imestatuswindow.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/impldde.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/doc/DocumentMetadataAccess.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/sidebar/ResourceManager.cxx | 12 |
8 files changed, 20 insertions, 20 deletions
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index 0fa5823fcb4c..4d46add22663 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -194,7 +194,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() css::uno::Reference< css::lang::XMultiServiceFactory > xProvider = css::configuration::theDefaultProvider::get( m_xContext ); css::beans::PropertyValue aArg( - OUString("nodepath"), -1, + "nodepath", -1, css::uno::makeAny( OUString( "/org.openoffice.Office.Common/I18N/InputMethod")), diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index aafde1c0b17b..d0d36941f590 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -220,7 +220,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink ) bool bSysTopic = false; if (!sTopic.equalsIgnoreAsciiCase("SYSTEM")) { - DdeConnection aTmp(sServer, OUString("SYSTEM")); + DdeConnection aTmp(sServer, "SYSTEM"); bSysTopic = !aTmp.GetError(); } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index a84a21bb88eb..260573c78cf5 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -107,8 +107,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::cppu; -#define IODLG_CONFIGNAME OUString("FilePicker_Save") -#define IMPGRF_CONFIGNAME OUString("FilePicker_Graph") +#define IODLG_CONFIGNAME "FilePicker_Save" +#define IMPGRF_CONFIGNAME "FilePicker_Graph" #define USERITEM_NAME "UserItem" namespace sfx2 @@ -1046,24 +1046,24 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( else { aInitArguments[0] <<= NamedValue( - OUString( "TemplateDescription" ), + "TemplateDescription", makeAny( nTemplateDescription ) ); aInitArguments[1] <<= NamedValue( - OUString( "StandardDir" ), + "StandardDir", makeAny( sStandardDir ) ); aInitArguments[2] <<= NamedValue( - OUString( "BlackList" ), + "BlackList", makeAny( rBlackList ) ); if ( mpPreferredParentWindow ) aInitArguments[3] <<= NamedValue( - OUString( "ParentWindow" ), + "ParentWindow", makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) ) ); } diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index fb4376e0b38c..1ace335f1648 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -423,10 +423,10 @@ mkException( OUString const & i_rMessage, iaioe.Classification = task::InteractionClassification_ERROR; iaioe.Code = i_ErrorCode; - const beans::PropertyValue uriProp(OUString("Uri"), + const beans::PropertyValue uriProp("Uri", -1, uno::makeAny(i_rUri), static_cast<beans::PropertyState>(0)); const beans::PropertyValue rnProp( - OUString("ResourceName"), + "ResourceName", -1, uno::makeAny(i_rResource), static_cast<beans::PropertyState>(0)); iaioe.Arguments = { uno::makeAny(uriProp), uno::makeAny(rnProp) }; return iaioe; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 76ff7a30ec32..f979407f10b2 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -3171,7 +3171,7 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() OUString aContentType; aAny >>= aContentType; - pImpl->xAttributes->Append( SvKeyValue( OUString("content-type"), aContentType ) ); + pImpl->xAttributes->Append( SvKeyValue( "content-type", aContentType ) ); } catch ( const css::uno::Exception& ) { diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 4077a2ab60f9..e51b987ff49d 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -874,7 +874,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, "UIName", OUString() ); - pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, OUString( "pdf" ), rStandardDir, rBlackList )); + pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, "pdf", rStandardDir, rBlackList )); pFileDlg->SetCurrentFilter( aFilterUIName ); } else diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index ad0520d4ba4d..a46a563acfbd 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3594,8 +3594,8 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat SfxModelGuard aGuard( *this ); datatransfer::DataFlavor aDataFlavor( - OUString("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ), - OUString("GDIMetaFile"), + "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", + "GDIMetaFile", cppu::UnoType<Sequence< sal_Int8 >>::get() ); embed::VisualRepresentation aVisualRepresentation; diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 9e0f0003ecf1..adbedece1695 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -251,7 +251,7 @@ void ResourceManager::ReadDeckList() { const utl::OConfigurationTreeRoot aDeckRootNode( comphelper::getProcessComponentContext(), - OUString("org.openoffice.Office.UI.Sidebar/Content/DeckList"), + "org.openoffice.Office.UI.Sidebar/Content/DeckList", false); if (!aDeckRootNode.isValid()) return; @@ -311,7 +311,7 @@ void ResourceManager::SaveDeckSettings(const DeckDescriptor* pDeckDesc) { const utl::OConfigurationTreeRoot aDeckRootNode( comphelper::getProcessComponentContext(), - OUString("org.openoffice.Office.UI.Sidebar/Content/DeckList"), + "org.openoffice.Office.UI.Sidebar/Content/DeckList", true); if (!aDeckRootNode.isValid()) return; @@ -332,7 +332,7 @@ void ResourceManager::SaveDeckSettings(const DeckDescriptor* pDeckDesc) const utl::OConfigurationTreeRoot aPanelRootNode( comphelper::getProcessComponentContext(), - OUString("org.openoffice.Office.UI.Sidebar/Content/PanelList"), + "org.openoffice.Office.UI.Sidebar/Content/PanelList", true); if (!aPanelRootNode.isValid()) @@ -368,7 +368,7 @@ void ResourceManager::ReadPanelList() { const utl::OConfigurationTreeRoot aPanelRootNode( comphelper::getProcessComponentContext(), - OUString("org.openoffice.Office.UI.Sidebar/Content/PanelList"), + "org.openoffice.Office.UI.Sidebar/Content/PanelList", false); if (!aPanelRootNode.isValid()) return; @@ -607,7 +607,7 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XController>& rxC rDeckDescriptor.msHelpText = rDeckDescriptor.msTitle; rDeckDescriptor.mbIsEnabled = true; rDeckDescriptor.mnOrderIndex = 100000 + nReadIndex; - rDeckDescriptor.maContextList.AddContextDescription(Context(sModuleName, OUString("any")), true, OUString()); + rDeckDescriptor.maContextList.AddContextDescription(Context(sModuleName, "any"), true, OUString()); maPanels.push_back(std::make_shared<PanelDescriptor>()); PanelDescriptor& rPanelDescriptor(*maPanels.back()); @@ -622,7 +622,7 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XController>& rxC rPanelDescriptor.mnOrderIndex = 100000 + nReadIndex; rPanelDescriptor.mbShowForReadOnlyDocuments = false; rPanelDescriptor.mbWantsCanvas = false; - rPanelDescriptor.maContextList.AddContextDescription(Context(sModuleName, OUString("any")), true, OUString()); + rPanelDescriptor.maContextList.AddContextDescription(Context(sModuleName, "any"), true, OUString()); } } |