diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-31 18:04:19 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-08 14:50:59 +0200 |
commit | 9d7712b48ddaa0f308b669625b5ebbb1a3e75634 (patch) | |
tree | f9e16d3650522393bc943bf4a5b6f08c3f7f5940 /sfx2 | |
parent | da20c7f4396b127072074f4d7999ed29deee02f0 (diff) |
remove unnecessary use of OUString constructor in SFX2 module
Change-Id: Ieafc413136a9b4b907de034914d918212e4c16e3
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/appbaslib.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/appopen.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/appl/childwin.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/appl/xpackcreator.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/control/unoctitm.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/backingcomp.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/SfxDocumentMetaData.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/docfac.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/doc/doctempl.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 58 | ||||
-rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/doc/ownsubfilterservice.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/printhelper.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 28 | ||||
-rw-r--r-- | sfx2/source/inet/inettbc.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/view/viewprn.cxx | 20 |
23 files changed, 119 insertions, 122 deletions
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx index 14125482f4f1..15c539d4fd75 100644 --- a/sfx2/source/appl/appbaslib.cxx +++ b/sfx2/source/appl/appbaslib.cxx @@ -165,7 +165,7 @@ Sequence< OUString > SfxApplicationDialogLibraryContainer::impl_getStaticSupport if( bNeedsInit ) { OUString* pSeq = seqServiceNames.getArray(); - pSeq[0] = OUString("com.sun.star.script.ApplicationDialogLibraryContainer"); + pSeq[0] = "com.sun.star.script.ApplicationDialogLibraryContainer"; bNeedsInit = sal_False; } return seqServiceNames; @@ -194,7 +194,7 @@ Sequence< OUString > SfxApplicationScriptLibraryContainer::impl_getStaticSupport { Sequence< OUString > seqServiceNames( 1 ); OUString* pSeq = seqServiceNames.getArray(); - pSeq[0] = OUString("com.sun.star.script.ApplicationScriptLibraryContainer"); + pSeq[0] = "com.sun.star.script.ApplicationScriptLibraryContainer"; return seqServiceNames; } diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 26a357081417..a758478d36b1 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -891,8 +891,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) Sequence < OUString > aProtocols(2); // add special protocols that always should be treated as internal - aProtocols[0] = OUString("private:*"); - aProtocols[1] = OUString("vnd.sun.star.*"); + aProtocols[0] = "private:*"; + aProtocols[1] = "vnd.sun.star.*"; // get registered protocol handlers from configuration Reference < XNameAccess > xAccess(officecfg::Office::ProtocolHandler::HandlerSet::get()); @@ -1036,12 +1036,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, sal_False ); if ( pNewViewItem && pNewViewItem->GetValue() ) - aTarget = OUString("_blank" ); + aTarget = "_blank" ; } if ( bHidden ) { - aTarget = OUString("_blank"); + aTarget = "_blank"; DBG_ASSERT( rReq.IsSynchronCall() || pLinkItem, "Hidden load process must be done synchronously!" ); } diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 36bf04342a68..f7116e3e7d4b 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -202,9 +202,8 @@ static sal_Bool checkURL( const char *pName, const char *pExt, OUString &rURL ) using namespace osl; DirectoryItem aDirItem; - rURL = OUString( "$BRAND_BASE_DIR/" ); - rURL += OUString::createFromAscii( pName ); - rURL += OUString::createFromAscii( pExt ); + rURL = "$BRAND_BASE_DIR/" + OUString::createFromAscii( pName ) + + OUString::createFromAscii( pExt ); rtl::Bootstrap::expandMacros( rURL ); if (!rURL.isEmpty()) @@ -219,9 +218,9 @@ static void showDocument( const char* pBaseName ) try { Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); Sequence < com::sun::star::beans::PropertyValue > args(2); - args[0].Name = OUString("ViewOnly"); + args[0].Name = "ViewOnly"; args[0].Value <<= sal_True; - args[1].Name = OUString("ReadOnly"); + args[1].Name = "ReadOnly"; args[1].Value <<= sal_True; OUString aURL; diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index be63e3c7f41e..e51bea83fb16 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -300,7 +300,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) aWinOpt.SetWindowState(OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8)); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = OUString("Data"); + aSeq[0].Name = "Data"; aSeq[0].Value <<= aWinData.makeStringAndClear(); aWinOpt.SetUserData( aSeq ); diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 201a15323b5e..1929c9b8b519 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -336,7 +336,7 @@ void ShutdownIcon::FromTemplate() xFrame = Reference < ::com::sun::star::frame::XFrame >( xDesktop, UNO_QUERY ); URL aTargetURL; - aTargetURL.Complete = OUString( "slot:5500" ); + aTargetURL.Complete = "slot:5500"; Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aTargetURL ); @@ -353,7 +353,7 @@ void ShutdownIcon::FromTemplate() { Sequence<PropertyValue> aArgs(1); PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = OUString("Referer"); + pArg[0].Name = "Referer"; pArg[0].Value <<= OUString("private:user"); Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY ); if ( xNotifyer.is() ) @@ -444,15 +444,15 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR Reference < com::sun::star::task::XInteractionHandler2 > xInteraction( task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); - aArgs[0].Name = OUString("InteractionHandler"); + aArgs[0].Name = "InteractionHandler"; aArgs[0].Value <<= xInteraction; sal_Int16 nMacroExecMode = ::com::sun::star::document::MacroExecMode::USE_CONFIG; - aArgs[1].Name = OUString("MacroExecutionMode"); + aArgs[1].Name = "MacroExecutionMode"; aArgs[1].Value <<= nMacroExecMode; sal_Int16 nUpdateDoc = ::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG; - aArgs[2].Name = OUString("UpdateDocMode"); + aArgs[2].Name = "UpdateDocMode"; aArgs[2].Value <<= nUpdateDoc; // use the filedlghelper to get the current filter name, @@ -474,7 +474,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR if ( bReadOnly ) { aArgs.realloc( ++nArgs ); - aArgs[nArgs-1].Name = OUString("ReadOnly"); + aArgs[nArgs-1].Name = "ReadOnly"; aArgs[nArgs-1].Value <<= bReadOnly; } @@ -489,7 +489,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR sal_Int16 uVersion = (sal_Int16)iVersion; aArgs.realloc( ++nArgs ); - aArgs[nArgs-1].Name = OUString("Version"); + aArgs[nArgs-1].Name = "Version"; aArgs[nArgs-1].Value <<= uVersion; } @@ -514,7 +514,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR if ( !aFilterName.isEmpty() ) { aArgs.realloc( ++nArgs ); - aArgs[nArgs-1].Name = OUString("FilterName"); + aArgs[nArgs-1].Name = "FilterName"; aArgs[nArgs-1].Value <<= aFilterName; } } diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index 0b7c70c49f3e..fbe0a40f7f2a 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -38,8 +38,8 @@ using namespace ::com::sun::star; uno::Sequence< OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames() { uno::Sequence< OUString > aRet(2); - aRet[0] = OUString("com.sun.star.embed.PackageStructureCreator"); - aRet[1] = OUString("com.sun.star.comp.embed.PackageStructureCreator"); + aRet[0] = "com.sun.star.embed.PackageStructureCreator"; + aRet[1] = "com.sun.star.comp.embed.PackageStructureCreator"; return aRet; } diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index c35c156e9cdd..14124f6fe1e0 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -484,7 +484,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c // The DocumentService property is only a preselection, and all preselections are considered as optional! // This "wrong" type will be sorted out now because we match only allowed filters to the detected type uno::Sequence< beans::NamedValue > lQuery(1); - lQuery[0].Name = OUString("Name"); + lQuery[0].Name = "Name"; lQuery[0].Value <<= sTypeName; pFilter = GetFilterForProps(lQuery, nMust, nDont); @@ -677,7 +677,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const OUString& rMediaType, S } com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = OUString("MediaType"); + aSeq[0].Name = "MediaType"; aSeq[0].Value <<= rMediaType; return GetFilterForProps( aSeq, nMust, nDont ); } @@ -706,7 +706,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const OUString& rType, SfxFilte } com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = OUString("Name"); + aSeq[0].Name = "Name"; aSeq[0].Value <<= OUString( rType ); return GetFilterForProps( aSeq, nMust, nDont ); } @@ -745,7 +745,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const OUString& rExt, Sf sExt = sExt.copy(1); com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = OUString("Extensions"); + aSeq[0].Name = "Extensions"; uno::Sequence < OUString > aExts(1); aExts[0] = sExt; aSeq[0].Value <<= aExts; @@ -759,7 +759,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( sal_uInt32 nId, SfxFil com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); OUString aName = SotExchange::GetFormatName( nId ); - aSeq[0].Name = OUString("ClipboardFormat"); + aSeq[0].Name = "ClipboardFormat"; aSeq[0].Value <<= aName; return GetFilterForProps( aSeq, nMust, nDont ); } @@ -996,7 +996,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl( // Extension preferred by the filter. This takes precedence // over those that are given in the file format type. lFilterProperties[nFilterProperty].Value >>= sExtension; - sExtension = OUString("*.") + sExtension; + sExtension = "*." + sExtension; } else if ( lFilterProperties[nFilterProperty].Name == "Type" ) { diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 09c57b36b66b..2576b14f8cfd 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -666,7 +666,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util // so we must retrieve this as an argument from the parsed URL lNewArgs.realloc( lNewArgs.getLength()+1 ); nMarkArg = lNewArgs.getLength()-1; - lNewArgs[nMarkArg].Name = OUString("Bookmark"); + lNewArgs[nMarkArg].Name = "Bookmark"; lNewArgs[nMarkArg].Value <<= aURL.Mark; } diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index dface02b7c01..d202a1c5cd5c 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -640,7 +640,7 @@ void SAL_CALL BackingComp::dispose() // kill the menu css::util::URL aURL; - aURL.Complete = OUString(".uno:close"); + aURL.Complete = ".uno:close"; css::uno::Reference< css::util::XURLTransformer > xParser = css::util::URLTransformer::create(m_xContext); if (xParser.is()) xParser->parseStrict(aURL); diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 4b6d7490d2cc..fa3408f21fff 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -501,7 +501,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) Sequence< com::sun::star::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = OUString("Referer"); + pArg[0].Name = "Referer"; pArg[0].Value <<= OUString("private:user"); dispatchURL( TEMPLATE_URL, OUString(), xFrame, aArgs ); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index fc92e367f375..bc606f86b80b 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -2181,7 +2181,7 @@ CmisYesNo::CmisYesNo( Window* pParent, bool bValue ) CmisPropertyLine::CmisPropertyLine( Window* pParent ) { m_nNumValue = 1; - m_sId = OUString(""); + m_sId = ""; m_sType = CMIS_TYPE_STRING; m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui"); get( m_pFrame, "CmisFrame" ); diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 614cb2690b85..ecfbf172afda 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -2327,7 +2327,7 @@ namespace comp_CompatWriterDocProps { css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { css::uno::Sequence< OUString > aServiceNames(1); - aServiceNames[ 0 ] = OUString( "com.sun.star.writer.DocumentProperties" ); + aServiceNames[ 0 ] = "com.sun.star.writer.DocumentProperties"; return aServiceNames; } @@ -2350,7 +2350,7 @@ OUString SAL_CALL _getImplementationName() { css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { css::uno::Sequence< OUString > s(1); - s[0] = OUString("com.sun.star.document.DocumentProperties"); + s[0] = "com.sun.star.document.DocumentProperties"; return s; } diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index cc2119a3e368..7018591b00ba 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -201,7 +201,7 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU static OUString SERVICE_TYPE_DECTECTION("com.sun.star.document.TypeDetection"); static OUString CONF_ROOT("/org.openoffice.Setup"); - static OUString CONF_PATH = OUString("Office/Factories/" ) + OUString( rServiceName ); + static OUString CONF_PATH = "Office/Factories/" + rServiceName; static OUString PROP_DEF_TEMPL_CHANGED("ooSetupFactorySystemDefaultTemplateChanged"); static OUString PROP_ACTUAL_FILTER("ooSetupFactoryActualFilter"); @@ -272,18 +272,18 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU aProps2.getUnpackedValueOrDefault("PreferredFilter", OUString() ); uno::Sequence< beans::PropertyValue > aArgs( 3 ); - aArgs[0].Name = OUString("FilterName"); + aArgs[0].Name = "FilterName"; aArgs[0].Value <<= aFilterName; - aArgs[1].Name = OUString("AsTemplate"); + aArgs[1].Name = "AsTemplate"; aArgs[1].Value <<= sal_True; - aArgs[2].Name = OUString("URL"); + aArgs[2].Name = "URL"; aArgs[2].Value <<= OUString( rTemplateName ); uno::Reference< frame::XLoadable > xLoadable( xFactory->createInstance( OUString( rServiceName ) ), uno::UNO_QUERY ); xLoadable->load( aArgs ); aArgs.realloc( 2 ); - aArgs[1].Name = OUString("Overwrite"); + aArgs[1].Name = "Overwrite"; aArgs[1].Value <<= sal_True; uno::Reference< frame::XStorable > xStorable( xLoadable, uno::UNO_QUERY ); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index a82ebe52543e..95ff9dd888c4 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -887,9 +887,9 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& a if ( !aInfo.isEmpty() && !aData[LOCKFILE_EDITTIME_ID].isEmpty() ) { - aInfo += OUString( " ( " ); + aInfo += " ( " ; aInfo += aData[LOCKFILE_EDITTIME_ID]; - aInfo += OUString( " )" ); + aInfo += " )"; } } @@ -1264,9 +1264,9 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf new utl::ProgressHandlerWrap( xStatusIndicator ) ); uno::Sequence< beans::PropertyValue > aAddProps( 2 ); - aAddProps[0].Name = OUString("RepairPackage"); + aAddProps[0].Name = "RepairPackage"; aAddProps[0].Value <<= (sal_Bool)true; - aAddProps[1].Name = OUString("StatusIndicator"); + aAddProps[1].Name = "StatusIndicator"; aAddProps[1].Value <<= xProgressHandler; // the first arguments will be filled later @@ -2222,7 +2222,7 @@ void SfxMedium::ClearBackup_Impl() if ( ::utl::UCBContentHelper::Kill( pImp->m_aBackupURL ) ) { pImp->m_bRemoveBackup = false; - pImp->m_aBackupURL = OUString(); + pImp->m_aBackupURL = ""; } else { @@ -2232,7 +2232,7 @@ void SfxMedium::ClearBackup_Impl() } } else - pImp->m_aBackupURL = OUString(); + pImp->m_aBackupURL = ""; } //---------------------------------------------------------------- @@ -2818,7 +2818,7 @@ void SfxMedium::CompleteReOpen() { pTmpFile = pImp->pTempFile; pImp->pTempFile = NULL; - pImp->m_aName = OUString(); + pImp->m_aName = ""; } GetMedium_Impl(); @@ -3280,7 +3280,7 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace ) return; DELETEZ( pImp->pTempFile ); - pImp->m_aName = OUString(); + pImp->m_aName = ""; } pImp->pTempFile = new ::utl::TempFile(); diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index afd3b925e932..e52d6c5dd156 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -832,7 +832,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom uno::Reference< XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString("Hidden"); + aArgs[0].Name = "Hidden"; aArgs[0].Value <<= sal_True; INetURLObject aTemplURL( rName ); @@ -1604,8 +1604,8 @@ void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle, // now get the content of the region uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps(2); - aProps[0] = OUString(TITLE ); - aProps[1] = OUString(TARGET_URL ); + aProps[0] = TITLE; + aProps[1] = TARGET_URL; try { @@ -1641,7 +1641,7 @@ void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot ) { uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps(1); - aProps[0] = OUString(TITLE ); + aProps[0] = TITLE; try { diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 341d86f160fb..654a7e3e8f17 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -406,9 +406,7 @@ void SfxDocTplService_Impl::init_Impl() // set maRootContent to the root of the templates hierarchy. Create the // entry if necessary - maRootURL = OUString( TEMPLATE_ROOT_URL ); - maRootURL += OUString( '/' ); - maRootURL += aLang; + maRootURL = ( TEMPLATE_ROOT_URL "/" ) + aLang; OUString aTemplVersPropName( TEMPLATE_VERSION ); OUString aTemplVers( TEMPLATE_VERSION_VALUE ); @@ -445,7 +443,7 @@ void SfxDocTplService_Impl::init_Impl() "cannot create DocumentProperties service:" << e.Message); } - OUString const aService = OUString( SERVICENAME_TYPEDETECTION ); + OUString const aService = SERVICENAME_TYPEDETECTION; mxType = uno::Reference< XTypeDetection > ( mxContext->getServiceManager()->createInstanceWithContext(aService, mxContext), UNO_QUERY ); getDirList(); @@ -616,9 +614,9 @@ sal_Bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUSt rURL, embed::ElementModes::READWRITE); uno::Sequence<beans::PropertyValue> medium(2); - medium[0].Name = OUString("DocumentBaseURL"); + medium[0].Name = "DocumentBaseURL"; medium[0].Value <<= rURL; - medium[1].Name = OUString("URL"); + medium[1].Name = "URL"; medium[1].Value <<= rURL; m_xDocProps->storeToStorage(xStorage, medium); @@ -696,9 +694,9 @@ sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder, if ( ! Content::create( aLinkURL, maCmdEnv, comphelper::getProcessComponentContext(), aLink ) ) { Sequence< OUString > aNames(3); - aNames[0] = OUString( TITLE ); - aNames[1] = OUString( IS_FOLDER ); - aNames[2] = OUString( TARGET_URL ); + aNames[0] = TITLE; + aNames[1] = IS_FOLDER; + aNames[2] = TARGET_URL; Sequence< Any > aValues(3); aValues[0] = makeAny( rTitle ); @@ -747,8 +745,8 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, try { Sequence< OUString > aNames(2); - aNames[0] = OUString( TITLE ); - aNames[1] = OUString( IS_FOLDER ); + aNames[0] = TITLE; + aNames[1] = IS_FOLDER; Sequence< Any > aValues(2); aValues[0] = makeAny( aFolderName ); @@ -757,9 +755,9 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, OUString aType; if ( bFsysFolder ) - aType = OUString( TYPE_FSYS_FOLDER ); + aType = TYPE_FSYS_FOLDER; else - aType = OUString( TYPE_FOLDER ); + aType = TYPE_FOLDER; aParent.insertNewContent( aType, aNames, aValues, rNewFolder ); bCreatedFolder = sal_True; @@ -812,8 +810,8 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& try { Sequence< OUString > aNames(2); - aNames[0] = OUString( TITLE ); - aNames[1] = OUString( IS_FOLDER ); + aNames[0] = TITLE; + aNames[1] = IS_FOLDER; Sequence< Any > aValues(2); aValues[0] = makeAny( aTryName ); @@ -872,14 +870,14 @@ OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& a if ( nInd ) aTryName += OUString::number( nInd ); if ( aExt.toChar() != '.' ) - aTryName += OUString( "." ); + aTryName += "."; aTryName += aExt; try { Sequence< OUString > aNames(2); - aNames[0] = OUString( TITLE ); - aNames[1] = OUString( IS_DOCUMENT ); + aNames[0] = TITLE; + aNames[1] = IS_DOCUMENT; Sequence< Any > aValues(2); aValues[0] = makeAny( aTryName ); @@ -1562,7 +1560,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps( 1 ); - aProps[0] = OUString(TARGET_URL ); + aProps[0] = TARGET_URL; try { @@ -1679,7 +1677,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps( 1 ); - aProps[0] = OUString(TARGET_URL ); + aProps[0] = TARGET_URL; ResultSetInclude eInclude = INCLUDE_DOCUMENTS_ONLY; xResultSet = aGroup.createCursor( aProps, eInclude ); @@ -1795,7 +1793,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, uno::Sequence< uno::Any > aArgs( 1 ); beans::PropertyValue aPathProp; - aPathProp.Name = OUString("nodepath"); + aPathProp.Name = "nodepath"; aPathProp.Value <<= OUString( "/org.openoffice.Setup/Office/Factories/" ); aArgs[0] <<= aPathProp; @@ -1871,9 +1869,9 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, // store template uno::Sequence< PropertyValue > aStoreArgs( 2 ); - aStoreArgs[0].Name = OUString("FilterName"); + aStoreArgs[0].Name = "FilterName"; aStoreArgs[0].Value <<= aFilterName; - aStoreArgs[1].Name = OUString("DocumentTitle"); + aStoreArgs[1].Name = "DocumentTitle"; aStoreArgs[1].Value <<= rTemplateName; if( !::utl::UCBContentHelper::EqualURLs( aNewTemplateTargetURL, rStorable->getLocation() )) @@ -2379,9 +2377,9 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps(3); - aProps[0] = OUString(TITLE ); - aProps[1] = OUString(TARGET_URL ); - aProps[2] = OUString(PROPERTY_TYPE ); + aProps[0] = TITLE ; + aProps[1] = TARGET_URL; + aProps[2] = PROPERTY_TYPE; try { @@ -2490,7 +2488,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList, Content aContent; uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps(1); - aProps[0] = OUString(TITLE ); + aProps[0] = TITLE; try { @@ -2556,7 +2554,7 @@ void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList, uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps(1); - aProps[0] = OUString(TITLE ); + aProps[0] = TITLE; try { @@ -2648,13 +2646,13 @@ void SfxDocTplService_Impl::updateData( DocTemplates_EntryData_Impl *pData ) if ( pData->getUpdateType() ) { - aPropName = OUString( PROPERTY_TYPE ); + aPropName = PROPERTY_TYPE; setProperty( aTemplate, aPropName, makeAny( pData->getType() ) ); } if ( pData->getUpdateLink() ) { - aPropName = OUString( TARGET_URL ); + aPropName = TARGET_URL; setProperty( aTemplate, aPropName, makeAny( pData->getTargetURL() ) ); } } diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index ddf8e07f347d..0dbd75d81c36 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -532,7 +532,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont ) { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); - aSearchRequest[0].Name = OUString("DocumentService"); + aSearchRequest[0].Name = "DocumentService"; aSearchRequest[0].Value <<= GetDocServiceName(); return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); @@ -550,9 +550,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( { // Preselect PDF-Filter for EXPORT uno::Sequence< beans::NamedValue > aSearchRequest( 2 ); - aSearchRequest[0].Name = OUString("Type"); + aSearchRequest[0].Name = "Type"; aSearchRequest[0].Value <<= OUString("pdf_Portable_Document_Format"); - aSearchRequest[1].Name = OUString("DocumentService"); + aSearchRequest[1].Name = "DocumentService"; aSearchRequest[1].Value <<= GetDocServiceName(); aFilterProps = ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); @@ -660,7 +660,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) // the saving is acceptable // in case the configuration entry is not set or set to false // or in case of version creation - OUString aVersionCommentString = OUString("VersionComment"); + OUString aVersionCommentString = "VersionComment"; if ( officecfg::Office::Common::Save::Document::AlwaysSaveAs::get() && GetMediaDescr().find( aVersionCommentString ) == GetMediaDescr().end() ) { @@ -839,7 +839,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); - aSearchRequest[0].Name = OUString("DocumentService"); + aSearchRequest[0].Name = "DocumentService"; aSearchRequest[0].Value <<= GetDocServiceName(); uno::Reference< container::XEnumeration > xFilterEnum = @@ -1186,7 +1186,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() if ( xFrameDispatch.is() ) { util::URL aURL; - aURL.Complete = OUString(".uno:SetDocumentProperties"); + aURL.Complete = ".uno:SetDocumentProperties"; uno::Reference < util::XURLTransformer > xTransformer( util::URLTransformer::create( comphelper::getProcessComponentContext() ) ); if ( xTransformer->parseStrict( aURL ) ) diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 26926cef58f0..d3b85a660009 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -44,8 +44,8 @@ OwnSubFilterService::~OwnSubFilterService() uno::Sequence< OUString > SAL_CALL OwnSubFilterService::impl_getStaticSupportedServiceNames() { uno::Sequence< OUString > aRet(2); - aRet[0] = OUString("com.sun.star.document.OwnSubFilter"); - aRet[1] = OUString("com.sun.star.comp.document.OwnSubFilter"); + aRet[0] = "com.sun.star.document.OwnSubFilter"; + aRet[1] = "com.sun.star.comp.document.OwnSubFilter"; return aRet; } diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 603331c61873..7be793d69802 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -650,7 +650,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& aCheckedArgs[nProps++].Value <<= sFileURL; // and append the local filename aCheckedArgs.realloc( aCheckedArgs.getLength()+1 ); - aCheckedArgs[nProps].Name = OUString("LocalFileName"); + aCheckedArgs[nProps].Name = "LocalFileName"; aCheckedArgs[nProps++].Value <<= OUString( sTemp ); } else @@ -666,7 +666,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& aCheckedArgs[nProps++].Value <<= sTemp; // and append the local filename aCheckedArgs.realloc( aCheckedArgs.getLength()+1 ); - aCheckedArgs[nProps].Name = OUString("LocalFileName"); + aCheckedArgs[nProps].Name = "LocalFileName"; aCheckedArgs[nProps++].Value <<= sPath; } else @@ -710,7 +710,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& sal_Bool bTemp = sal_Bool(); if ( rProp.Value >>= bTemp ) { - aCheckedArgs[nProps].Name = OUString("Collate"); + aCheckedArgs[nProps].Name = "Collate"; aCheckedArgs[nProps++].Value <<= bTemp; } else diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 7c7400940989..996fdb07ee9a 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1038,13 +1038,13 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE aRectSeq[3] = aTmpRect.Bottom(); seqArgsNew.realloc( ++nNewLength ); - seqArgsNew[ nNewLength - 1 ].Name = OUString("WinExtent"); + seqArgsNew[ nNewLength - 1 ].Name = "WinExtent"; seqArgsNew[ nNewLength - 1 ].Value <<= aRectSeq; if ( !m_pData->m_aPreusedFilterName.isEmpty() ) { seqArgsNew.realloc( ++nNewLength ); - seqArgsNew[ nNewLength - 1 ].Name = OUString("PreusedFilterName"); + seqArgsNew[ nNewLength - 1 ].Name = "PreusedFilterName"; seqArgsNew[ nNewLength - 1 ].Value <<= m_pData->m_aPreusedFilterName; } @@ -1060,7 +1060,7 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE aBorderSeq[3] = aBorder.Bottom(); seqArgsNew.realloc( ++nNewLength ); - seqArgsNew[ nNewLength - 1 ].Name = OUString("DocumentBorder"); + seqArgsNew[ nNewLength - 1 ].Name = "DocumentBorder"; seqArgsNew[ nNewLength - 1 ].Value <<= aBorderSeq; } @@ -2221,54 +2221,54 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo aFlavorSeq[0].MimeType = OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); - aFlavorSeq[0].HumanPresentableName = OUString( "GDIMetaFile" ); + aFlavorSeq[0].HumanPresentableName = "GDIMetaFile"; aFlavorSeq[0].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[1].MimeType = OUString( "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); - aFlavorSeq[1].HumanPresentableName = OUString( "GDIMetaFile" ); + aFlavorSeq[1].HumanPresentableName = "GDIMetaFile"; aFlavorSeq[1].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[2].MimeType = OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); - aFlavorSeq[2].HumanPresentableName = OUString( "Enhanced Windows MetaFile" ); + aFlavorSeq[2].HumanPresentableName = "Enhanced Windows MetaFile"; aFlavorSeq[2].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[3].MimeType = OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); - aFlavorSeq[3].HumanPresentableName = OUString( "Windows MetaFile" ); + aFlavorSeq[3].HumanPresentableName = "Windows MetaFile"; aFlavorSeq[3].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[4].MimeType = OUString( "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ); - aFlavorSeq[4].HumanPresentableName = OUString( "Star Object Descriptor (XML)" ); + aFlavorSeq[4].HumanPresentableName = "Star Object Descriptor (XML)"; aFlavorSeq[4].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[5].MimeType = OUString( "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"" ); - aFlavorSeq[5].HumanPresentableName = OUString( "Star Embed Source (XML)" ); + aFlavorSeq[5].HumanPresentableName = "Star Embed Source (XML)"; aFlavorSeq[5].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[6].MimeType = OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ); - aFlavorSeq[6].HumanPresentableName = OUString( "Bitmap" ); + aFlavorSeq[6].HumanPresentableName = "Bitmap"; aFlavorSeq[6].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[7].MimeType = OUString( "image/png" ); - aFlavorSeq[7].HumanPresentableName = OUString( "PNG" ); + aFlavorSeq[7].HumanPresentableName = "PNG"; aFlavorSeq[7].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); if ( nSuppFlavors == 10 ) { aFlavorSeq[8].MimeType = OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); - aFlavorSeq[8].HumanPresentableName = OUString( "Enhanced Windows MetaFile" ); + aFlavorSeq[8].HumanPresentableName = "Enhanced Windows MetaFile"; aFlavorSeq[8].DataType = getCppuType( (const sal_uInt64*) 0 ); aFlavorSeq[9].MimeType = OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); - aFlavorSeq[9].HumanPresentableName = OUString( "Windows MetaFile" ); + aFlavorSeq[9].HumanPresentableName = "Windows MetaFile"; aFlavorSeq[9].DataType = getCppuType( (const sal_uInt64*) 0 ); } @@ -2767,7 +2767,7 @@ void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const OUString& rTi if ( nArg == nCount ) { rSeq.realloc( nCount+1 ); - rSeq[nCount].Name = OUString( "Title" ); + rSeq[nCount].Name = "Title"; rSeq[nCount].Value <<= rTitle; } } diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 4c28036747ee..924896cf821e 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -112,17 +112,17 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, sal_Bool /*bNew* if ( xDispatch.is() ) { Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString("Referer"); + aArgs[0].Name = "Referer"; aArgs[0].Value = makeAny( OUString(SFX_REFERER_USER )); - aArgs[1].Name = OUString( "FileName" ); + aArgs[1].Name = "FileName"; aArgs[1].Value = makeAny( OUString( aName )); if ( !aFilter.isEmpty() ) { aArgs.realloc( 4 ); - aArgs[2].Name = OUString("FilterOptions"); + aArgs[2].Name = "FilterOptions"; aArgs[2].Value = makeAny( OUString( aOptions )); - aArgs[3].Name = OUString("FilterName"); + aArgs[3].Name = "FilterName"; aArgs[3].Value = makeAny( OUString( aFilter )); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 6d7b016b7f66..ccd7d9889112 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -3102,7 +3102,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) else { ::com::sun::star::util::URL aTargetURL; - aTargetURL.Complete = OUString(".component:DB/DataSourceBrowser"); + aTargetURL.Complete = ".component:DB/DataSourceBrowser"; Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::com::sun::star::util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); @@ -3116,7 +3116,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) { Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1); ::com::sun::star::beans::PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = OUString("Referer"); + pArg[0].Name = "Referer"; pArg[0].Value <<= OUString("private:user"); xDisp->dispatch( aTargetURL, aArgs ); } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index c6a4afad7b39..056582adaa01 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -130,10 +130,10 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_ setValue( rProps[nProp].Name, rProps[nProp].Value ); Sequence< beans::PropertyValue > aRenderOptions( 3 ); - aRenderOptions[0].Name = OUString( "ExtraPrintUIOptions" ); - aRenderOptions[1].Name = OUString( "View" ); + aRenderOptions[0].Name = "ExtraPrintUIOptions"; + aRenderOptions[1].Name = "View" ; aRenderOptions[1].Value = i_rViewProp; - aRenderOptions[2].Name = OUString( "IsPrinter" ); + aRenderOptions[2].Name = "IsPrinter"; aRenderOptions[2].Value <<= sal_True; try { @@ -214,7 +214,7 @@ Sequence< beans::PropertyValue > SfxPrinterController::getMergedOptions() const } Sequence< beans::PropertyValue > aRenderOptions( 1 ); - aRenderOptions[ 0 ].Name = OUString( "RenderDevice" ); + aRenderOptions[ 0 ].Name = "RenderDevice"; aRenderOptions[ 0 ].Value <<= mxDevice; aRenderOptions = getJobProperties( aRenderOptions ); @@ -704,22 +704,22 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) { if ( aProps[nProp].Name == "Copies" ) { - aProps[nProp]. Name = OUString("CopyCount"); + aProps[nProp]. Name = "CopyCount"; } else if ( aProps[nProp].Name == "RangeText" ) { - aProps[nProp]. Name = OUString("Pages"); + aProps[nProp]. Name = "Pages"; } else if ( aProps[nProp].Name == "Asynchron" ) { - aProps[nProp]. Name = OUString("Wait"); + aProps[nProp]. Name = "Wait"; sal_Bool bAsynchron = sal_False; aProps[nProp].Value >>= bAsynchron; aProps[nProp].Value <<= (sal_Bool) (!bAsynchron); } else if ( aProps[nProp].Name == "Silent" ) { - aProps[nProp]. Name = OUString("MonitorVisible"); + aProps[nProp]. Name = "MonitorVisible"; sal_Bool bPrintSilent = sal_False; aProps[nProp].Value >>= bPrintSilent; aProps[nProp].Value <<= (sal_Bool) (!bPrintSilent); @@ -739,13 +739,13 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) // it would be better if writer handled this internally if( nId == SID_PRINTDOCDIRECT ) { - aProps[nLen].Name = OUString( "PrintSelectionOnly" ); + aProps[nLen].Name = "PrintSelectionOnly"; aProps[nLen].Value = makeAny( bSelection ); } else // if nId == SID_PRINTDOC ; nothing to do with the previous HACK { // should the printer selection and properties dialogue display an help button - aProps[nLen].Name = OUString( "HideHelpButton" ); + aProps[nLen].Name = "HideHelpButton"; aProps[nLen].Value = makeAny( bPrintOnHelp ); } |