ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

remove unnecessary use of OUString constructor when assigning

Browse Source 
change code like
   aStr = OUString("xxxx");
to
   aStr = "xxxx";

Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
This commit is contained in:
Noel Grandin
2013-11-19 10:29:31 +02:00
parent 2c35fff7ec
commit 610b2b94b3
315 changed files with 952 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessibility/source/standard/vclxaccessiblecombobox.cxx
+1 -1
View File
@@ -80,7 +80,7 @@ Sequence< OUString > VCLXAccessibleComboBox::getSupportedServiceNames (void)
Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
sal_Int32 nLength = aNames.getLength();
aNames.realloc( nLength + 1 );
aNames[nLength] = OUString( "com.sun.star.accessibility.AccessibleComboBox" );
aNames[nLength] = "com.sun.star.accessibility.AccessibleComboBox";
return aNames;
}
accessibility/source/standard/vclxaccessiblestatusbar.cxx
+1 -1
View File
@@ -292,7 +292,7 @@ OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeExceptio
Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException)
{
Sequence< OUString > aNames(1);
aNames[0] = OUString( "com.sun.star.awt.AccessibleStatusBar" );
aNames[0] = "com.sun.star.awt.AccessibleStatusBar";
return aNames;
}
basctl/source/basicide/baside2b.cxx
+5 -5
View File
@@ -252,8 +252,8 @@ EditorWindow::EditorWindow (Window* pParent, ModulWindow* pModulWindow) :
notifier_ = n;
}
Sequence< OUString > s(2);
s[0] = OUString( "FontHeight" );
s[1] = OUString( "FontName" );
s[0] = "FontHeight";
s[1] = "FontName";
n->addPropertiesChangeListener(s, listener_.get());
}
@@ -779,9 +779,9 @@ void EditorWindow::HandleProcedureCompletion()
OUString sText("\nEnd ");
aSel = GetEditView()->GetSelection();
if( sProcType.equalsIgnoreAsciiCase("function") )
sText += OUString( "Function\n" );
sText += "Function\n";
if( sProcType.equalsIgnoreAsciiCase("sub") )
sText += OUString( "Sub\n" );
sText += "Sub\n";
if( nLine+1 == pEditEngine->GetParagraphCount() )
{
@@ -2539,7 +2539,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
}
else
{
aWatchStr = OUString( "Null" );
aWatchStr = "Null";
if( pItem->mpObject != NULL )
{
bCollapse = true;
basic/source/comp/io.cxx
+2 -2
View File
@@ -115,7 +115,7 @@ void SbiParser::Line()
aGen.Statement();
KeywordSymbolInfo aInfo;
aInfo.m_aKeywordSymbol = OUString( "line" );
aInfo.m_aKeywordSymbol = "line";
aInfo.m_eSbxDataType = GetType();
aInfo.m_eTok = SYMBOL;
@@ -278,7 +278,7 @@ void SbiParser::Name()
aGen.Statement();
KeywordSymbolInfo aInfo;
aInfo.m_aKeywordSymbol = OUString( "name" );
aInfo.m_aKeywordSymbol = "name";
aInfo.m_eSbxDataType = GetType();
aInfo.m_eTok = SYMBOL;
bridges/test/java_uno/acquire/testacquire.cxx
+2 -2
View File
@@ -477,7 +477,7 @@ OUString Service::getImplementationName_static() {
css::uno::Sequence< OUString > Service::getSupportedServiceNames_static() {
css::uno::Sequence< OUString > names(1);
names[0] = OUString( "com.sun.star.test.bridges.testacquire" );
names[0] = "com.sun.star.test.bridges.testacquire";
return names;
}
@@ -513,7 +513,7 @@ bool writeInfo(void * registryKey, OUString const & implementationName,
css::uno::Sequence< OUString > const & serviceNames) {
OUString keyName( "/" );
keyName += implementationName;
keyName += OUString( "/UNO/SERVICES" );
keyName += "/UNO/SERVICES";
css::uno::Reference< css::registry::XRegistryKey > key;
try {
key = static_cast< css::registry::XRegistryKey * >(registryKey)->
bridges/test/java_uno/equals/testequals.cxx
+2 -2
View File
@@ -122,7 +122,7 @@ Service::get(OUString const & rName) throw (css::uno::RuntimeException)
css::uno::Sequence< OUString > Service::getSupportedServiceNames_static()
{
css::uno::Sequence< OUString > aNames(1);
aNames[0] = OUString( "com.sun.star.test.bridges.testequals" );
aNames[0] = "com.sun.star.test.bridges.testequals";
return aNames;
}
@@ -175,7 +175,7 @@ bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName,
{
OUString aKeyName( "/" );
aKeyName += OUString::createFromAscii(pImplementationName);
aKeyName += OUString( "/UNO/SERVICES" );
aKeyName += "/UNO/SERVICES";
css::uno::Reference< css::registry::XRegistryKey > xKey;
try
{
bridges/test/testcomp.cxx
+1 -1
View File
@@ -69,7 +69,7 @@ void parseCommandLine( char *argv[] ,
if( -1 == nIndex )
{
*pConnection = sTemp;
*pProtocol = OUString( "iiop" );
*pProtocol = "iiop";
}
else
{
canvas/workben/canvasdemo.cxx
+2 -2
View File
@@ -138,8 +138,8 @@ class DemoRenderer
lang::Locale aLocale;
rendering::FontInfo aFontInfo;
aFontInfo.FamilyName = OUString( "Swiss" );
aFontInfo.StyleName = OUString( "SansSerif" );
aFontInfo.FamilyName = "Swiss";
aFontInfo.StyleName = "SansSerif";
geometry::Matrix2D aFontMatrix( 1, 0,
0, 1 );
rendering::FontRequest aFontRequest( aFontInfo, 12.0, 0.0, aLocale );
chart2/source/tools/InternalDataProvider.cxx
+1 -1
View File
@@ -1092,7 +1092,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang
uno::RuntimeException)
{
XMLRangeHelper::CellRange aRange;
aRange.aTableName = OUString( "local-table" );
aRange.aTableName = "local-table";
// attention: this data provider has the limitation that it stores
// internally if data comes from columns or rows. It is intended for
comphelper/source/xml/ofopxmlhelper.cxx
+2 -2
View File
@@ -41,7 +41,7 @@ namespace comphelper {
uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const OUString aStreamName, const uno::Reference< uno::XComponentContext > xContext )
throw( uno::Exception )
{
OUString aStringID = OUString( "_rels/" );
OUString aStringID = "_rels/";
aStringID += aStreamName;
return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT, xContext );
}
@@ -50,7 +50,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::Read
uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadContentTypeSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext )
throw( uno::Exception )
{
OUString aStringID = OUString( "[Content_Types].xml" );
OUString aStringID = "[Content_Types].xml";
return ReadSequence_Impl( xInStream, aStringID, CONTENTTYPE_FORMAT, xContext );
}
connectivity/source/commontools/parameters.cxx
+3 -3
View File
@@ -228,14 +228,14 @@ namespace dbtools
// format is:
// <detail_column> = :<new_param_name>
sFilter = quoteName( m_sIdentifierQuoteString, _rDetailLink );
sFilter += OUString( " = :" );
sFilter += " = :";
// generate a parameter name which is not already used
_rNewParamName = OUString( "link_from_" );
_rNewParamName = "link_from_";
_rNewParamName += convertName2SQLName( _rMasterColumn, m_sSpecialCharacters );
while ( m_aParameterInformation.find( _rNewParamName ) != m_aParameterInformation.end() )
{
_rNewParamName += OUString( "_" );
_rNewParamName += "_";
}
return sFilter += _rNewParamName;
connectivity/source/commontools/statementcomposer.cxx
+1 -1
View File
@@ -126,7 +126,7 @@ namespace dbtools
if ( _rData.sCommand.isEmpty() )
break;
sStatement = OUString( "SELECT * FROM " );
sStatement = "SELECT * FROM ";
OUString sCatalog, sSchema, sTable;
qualifiedNameComponents( _rData.xConnection->getMetaData(), _rData.sCommand, sCatalog, sSchema, sTable, eInDataManipulation );
connectivity/source/drivers/hsqldb/HConnection.cxx
+1 -1
View File
@@ -358,7 +358,7 @@ namespace connectivity { namespace hsqldb
// ask the provider to obtain a graphic
Sequence< PropertyValue > aMediaProperties( 1 );
aMediaProperties[0].Name = OUString( "URL" );
aMediaProperties[0].Name = "URL";
aMediaProperties[0].Value <<= sImageURL;
xGraphic = xProvider->queryGraphic( aMediaProperties );
OSL_ENSURE( xGraphic.is(), "OHsqlConnection::impl_getTextTableIcon_nothrow: the provider did not give us a graphic object!" );
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+1 -1
View File
@@ -560,7 +560,7 @@ OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodN
{
OUString sLoggedResult( sReturn );
if ( sLoggedResult.isEmpty() )
sLoggedResult = OUString( "<empty string>" );
sLoggedResult = "<empty string>";
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, sLoggedResult );
}
connectivity/source/drivers/mork/MDriver.cxx
+1 -1
View File
@@ -48,7 +48,7 @@ OUString MorkDriver::getImplementationName_Static( ) throw(css::uno::RuntimeExc
css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException)
{
css::uno::Sequence< OUString > aSNS(1);
aSNS[0] = OUString( "com.sun.star.sdbc.Driver");
aSNS[0] = "com.sun.star.sdbc.Driver";
return aSNS;
}
connectivity/source/drivers/mozab/MConnection.cxx
+5 -5
View File
@@ -192,8 +192,8 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
// * for windows system address book
// "sdbc:address:outlookexp:" -> aboutlookdirectory://oe/
//
m_sBindDN = OUString( "");
m_sPassword = OUString( "");
m_sBindDN = "";
m_sPassword = "";
m_bUseSSL = sal_False;
if ( aAddrbookScheme.equalsAscii( getSdbcScheme( SDBC_MOZILLA ) ) ) {
@@ -280,19 +280,19 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
throwSQLException( STR_NO_HOSTNAME, *this );
if ( nPortNumber > 0 ) {
m_sMozillaURI += OUString( ":" );
m_sMozillaURI += ":";
m_sMozillaURI += OUString::number( nPortNumber );
}
if ( !sBaseDN.isEmpty() ) {
m_sMozillaURI += OUString( "/" );
m_sMozillaURI += "/";
m_sMozillaURI += sBaseDN;
}
else
throwSQLException( STR_NO_BASEDN, *this );
// Addition of a fake query to enable the Mozilla LDAP directory to work correctly.
m_sMozillaURI += OUString( "?(or(DisplayName,=,DontDoThisAtHome)))");
m_sMozillaURI += "?(or(DisplayName,=,DontDoThisAtHome)))";
}
else if ( aAddrbookScheme.equalsAscii( getSdbcScheme( SDBC_OUTLOOK_MAPI ) ) ) {
connectivity/source/drivers/mozab/MDriver.cxx
+1 -1
View File
@@ -93,7 +93,7 @@ Sequence< OUString > MozabDriver::getSupportedServiceNames_Static( ) throw (Run
// which service is supported
// for more information @see com.sun.star.sdbc.Driver
Sequence< OUString > aSNS( 1 );
aSNS[0] = OUString( "com.sun.star.sdbc.Driver");
aSNS[0] = "com.sun.star.sdbc.Driver";
return aSNS;
}
connectivity/source/drivers/mozab/MServices.cxx
+2 -2
View File
@@ -94,7 +94,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere
{
// get the symbol for the method creating the factory
const OUString sFactoryCreationFunc = OUString( "OMozillaBootstrap_CreateInstance");
const OUString sFactoryCreationFunc = "OMozillaBootstrap_CreateInstance";
// reinterpret_cast<OMozabConnection_CreateInstanceFunction> removed GNU C
OMozillaBootstrap_CreateInstanceFunction s_pCreationFunc = (OMozillaBootstrap_CreateInstanceFunction)osl_getFunctionSymbol(s_hModule, sFactoryCreationFunc.pData);
@@ -130,7 +130,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozab_component_getFactory(
else if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" )
{
Sequence< OUString > aSNS( 1 );
aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap");
aSNS[0] = "com.sun.star.mozilla.MozillaBootstrap";
aReq.CREATE_PROVIDER(
aImplName,
aSNS,
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+2 -2
View File
@@ -90,7 +90,7 @@ Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw
// which service is supported
// for more information @see com.sun.star.mozilla.MozillaBootstrap
Sequence< OUString > aSNS( 1 );
aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap");
aSNS[0] = "com.sun.star.mozilla.MozillaBootstrap";
return aSNS;
}
@@ -240,7 +240,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozbootstrap_component_getFactory
if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" )
{
Sequence< OUString > aSNS( 1 );
aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap");
aSNS[0] = "com.sun.star.mozilla.MozillaBootstrap";
xFactory = ::cppu::createSingleFactory(
reinterpret_cast< XMultiServiceFactory* > ( pServiceManager),
cui/source/dialogs/colorpicker.cxx
+1 -1
View File
@@ -1523,7 +1523,7 @@ Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XCompone
Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( RuntimeException )
{
Sequence< OUString > seq(1);
seq[0] = OUString( "com.sun.star.ui.dialogs.ColorPicker" );
seq[0] = "com.sun.star.ui.dialogs.ColorPicker";
return seq;
}
cui/source/dialogs/cuigaldlg.cxx
+2 -2
View File
@@ -133,8 +133,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext() );
Sequence< OUString > aProps( 2 );
aProps.getArray()[ 0 ] = OUString( "IsFolder" );
aProps.getArray()[ 1 ] = OUString( "IsDocument" );
aProps.getArray()[ 0 ] = "IsFolder";
aProps.getArray()[ 1 ] = "IsDocument";
::com::sun::star::uno::Reference< XResultSet > xResultSet(
aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) );
cui/source/dialogs/hlmarkwn.cxx
+1 -1
View File
@@ -323,7 +323,7 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(OUString aURL)
try
{
uno::Sequence< beans::PropertyValue > aArg(1);
aArg.getArray()[0].Name = OUString( "Hidden" );
aArg.getArray()[0].Name = "Hidden";
aArg.getArray()[0].Value <<= (sal_Bool) sal_True;
xComp = xLoader->loadComponentFromURL( aURL, OUString( "_blank" ), 0, aArg );
}
dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+1 -1
View File
@@ -153,7 +153,7 @@ namespace dbmm
Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames_static() throw(RuntimeException)
{
Sequence< OUString > aServices(1);
aServices[0] = OUString( "com.sun.star.sdb.application.MacroMigrationWizard" );
aServices[0] = "com.sun.star.sdb.application.MacroMigrationWizard";
return aServices;
}
dbaccess/source/ext/macromigration/migrationengine.cxx
+1 -1
View File
@@ -286,7 +286,7 @@ namespace dbmm
Reference< XCommandProcessor > xCommandProcessor( _rDocument.xCommandProcessor, UNO_SET_THROW );
Command aCommand;
aCommand.Name = OUString( "openDesign" );
aCommand.Name = "openDesign";
aCommand.Argument <<= aLoadArgs.getPropertyValues();
Reference< XComponent > xDocComponent(
xCommandProcessor->execute(
dbaccess/source/sdbtools/connection/connectiontools.cxx
+1 -1
View File
@@ -119,7 +119,7 @@ namespace sdbtools
Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static()
{
Sequence< OUString > aSupported( 1 );
aSupported[0] = OUString( "com.sun.star.sdb.tools.ConnectionTools" );
aSupported[0] = "com.sun.star.sdb.tools.ConnectionTools";
return aSupported;
}
dbaccess/source/ui/app/subcomponentmanager.cxx
+1 -1
View File
@@ -275,7 +275,7 @@ namespace dbaui
sal_Int32 nCommandIdentifier = _rxCommandProcessor->createCommandIdentifier();
Command aCommand;
aCommand.Name = OUString( "close" );
aCommand.Name = "close";
_rxCommandProcessor->execute( aCommand, nCommandIdentifier, NULL );
bSuccess = true;
}
dbaccess/source/ui/browser/brwctrlr.cxx
+1 -1
View File
@@ -433,7 +433,7 @@ OUString SAL_CALL SbaXDataBrowserController::FormControllerImpl::getMode( ) thr
Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getSupportedModes( ) throw (RuntimeException)
{
Sequence< OUString > aModes(1);
aModes[1] = OUString( "DataMode" );
aModes[1] = "DataMode";
return aModes;
}
dbaccess/source/ui/dlg/queryorder.cxx
+2 -2
View File
@@ -155,8 +155,8 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow()
{
try
{
const OUString sNameProperty = OUString( "Name" );
const OUString sAscendingProperty = OUString( "IsAscending" );
const OUString sNameProperty = "Name";
const OUString sAscendingProperty = "IsAscending";
Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_QUERY_THROW );
sal_Int32 nColumns = xOrderColumns->getCount();
dbaccess/source/ui/misc/WCopyTable.cxx
+1 -1
View File
@@ -892,7 +892,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
m_bCreatePrimaryKeyColumn = sal_True;
m_aKeyName = pPage->GetKeyName();
if ( m_aKeyName.isEmpty() )
m_aKeyName = OUString( "ID" );
m_aKeyName = "ID";
m_aKeyName = createUniqueName( m_aKeyName );
sal_Int32 nBreakPos2 = 0;
CheckColumns(nBreakPos2);
dbaccess/source/ui/misc/linkeddocuments.cxx
+3 -3
View File
@@ -138,7 +138,7 @@ namespace dbaui
switch ( _eOpenMode )
{
case E_OPEN_NORMAL:
sOpenMode = OUString( "open" );
sOpenMode = "open";
break;
case E_OPEN_FOR_MAIL:
@@ -146,7 +146,7 @@ namespace dbaui
// fall through
case E_OPEN_DESIGN:
sOpenMode = OUString( "openDesign" );
sOpenMode = "openDesign";
break;
default:
@@ -301,7 +301,7 @@ namespace dbaui
aCommandArgs.put( "OpenMode", aOpenModeArg );
Command aCommand;
aCommand.Name = OUString( "openDesign" );
aCommand.Name = "openDesign";
aCommand.Argument <<= aCommandArgs.getPropertyValues();
WaitObject aWaitCursor( m_pDialogParent );
xNewDocument.set( xContent->execute( aCommand, xContent->createCommandIdentifier(), NULL ), UNO_QUERY );
dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+1 -1
View File
@@ -208,7 +208,7 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con
++crit, ++c
)
{
aCriteria[c].Name = OUString( "Criterion_" ) + OUString::number( c );
aCriteria[c].Name = "Criterion_" + OUString::number( c );
aCriteria[c].Value <<= *crit;
}
dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+2 -2
View File
@@ -59,7 +59,7 @@ long LimitBoxImpl::Notify( NotifyEvent& rNEvt )
{
nHandled = LimitBox::Notify( rNEvt );
uno::Sequence< beans::PropertyValue > aArgs( 1 );
aArgs[0].Name = OUString( "DBLimit.Value" );
aArgs[0].Name = "DBLimit.Value";
aArgs[0].Value = uno::makeAny( GetValue() );
m_pControl->dispatchCommand( aArgs );
break;
@@ -225,7 +225,7 @@ void LimitBoxController::dispatchCommand(
uno::Reference< frame::XDispatch > xDispatch;
uno::Reference< util::XURLTransformer > xURLTransformer = getURLTransformer();
aURL.Complete = OUString( ".uno:DBLimit" );
aURL.Complete = ".uno:DBLimit";
xURLTransformer->parseStrict( aURL );
xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
if ( xDispatch.is() )
desktop/source/app/appinit.cxx
+1 -1
View File
@@ -274,7 +274,7 @@ void Desktop::CreateTemporaryDirectory()
if ( aResId.GetResMgr()->IsAvailable( aResId ))
aMsg = OUString( aResId );
else
aMsg = OUString( "The path manager is not available.\n" );
aMsg = "The path manager is not available.\n";
e.Message = aMsg + e.Message;
throw;
}
desktop/source/migration/services/wordbookmigration.cxx
+1 -1
View File
@@ -67,7 +67,7 @@ namespace migration
if ( !pNames )
{
static Sequence< OUString > aNames(1);
aNames.getArray()[0] = OUString( "com.sun.star.migration.Wordbooks" );
aNames.getArray()[0] = "com.sun.star.migration.Wordbooks";
pNames = &aNames;
}
}
editeng/source/misc/svxacorr.cxx
+2 -2
View File
@@ -616,10 +616,10 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
if ( rCC.getLanguageTag().getLanguage() == "fr" )
{
bool bFrCA = (rCC.getLanguageTag().getCountry() == "CA");
OUString allChars = OUString( ":;?!%" );
OUString allChars = ":;?!%";
OUString chars( allChars );
if ( bFrCA )
chars = OUString( ":" );
chars = ":";
sal_Unicode cChar = rTxt[ nEndPos ];
bool bHasSpace = chars.indexOf( cChar ) != -1;
embeddedobj/source/commonembedding/persistence.cxx
+19 -19
View File
@@ -106,7 +106,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans:
if ( !bAsTemplateSet )
{
aResult.realloc( nLength + 1 );
aResult[nLength].Name = OUString( "AsTemplate" );
aResult[nLength].Name = "AsTemplate";
aResult[nLength].Value <<= sal_True;
}
@@ -221,7 +221,7 @@ static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, c
if ( xDocument.is() )
{
uno::Sequence< beans::PropertyValue > aSeq( 1 );
aSeq[0].Name = OUString( "SetEmbedded" );
aSeq[0].Name = "SetEmbedded";
aSeq[0].Value <<= sal_True;
xDocument->attachResource( OUString(), aSeq );
@@ -377,14 +377,14 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl()
sal_Int32 nLen = 2;
uno::Sequence< beans::PropertyValue > aArgs( nLen );
aArgs[0].Name = OUString( "URL" );
aArgs[0].Name = "URL";
aArgs[0].Value <<= m_aLinkURL;
aArgs[1].Name = OUString( "FilterName" );
aArgs[1].Name = "FilterName";
aArgs[1].Value <<= m_aLinkFilterName;
if ( m_bLinkHasPassword )
{
aArgs.realloc( ++nLen );
aArgs[nLen-1].Name = OUString( "Password" );
aArgs[nLen-1].Name = "Password";
aArgs[nLen-1].Value <<= m_aLinkPassword;
}
@@ -590,13 +590,13 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr
throw io::IOException(); // TODO:
uno::Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0].Name = OUString( "FilterName" );
aArgs[0].Name = "FilterName";
aArgs[0].Value <<= aFilterName;
aArgs[1].Name = OUString( "OutputStream" );
aArgs[1].Name = "OutputStream";
aArgs[1].Value <<= xTempOut;
aArgs[2].Name = OUString( "DocumentBaseURL" );
aArgs[2].Name = "DocumentBaseURL";
aArgs[2].Value <<= aBaseURL;
aArgs[3].Name = OUString( "HierarchicalDocumentName" );
aArgs[3].Name = "HierarchicalDocumentName";
aArgs[3].Value <<= aHierarchName;
xStorable->storeToURL( OUString( "private:stream" ), aArgs );
@@ -751,11 +751,11 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed:
throw io::IOException(); // TODO:
uno::Sequence< beans::PropertyValue > aArgs( 3 );
aArgs[0].Name = OUString( "FilterName" );
aArgs[0].Name = "FilterName";
aArgs[0].Value <<= aFilterName;
aArgs[2].Name = OUString( "DocumentBaseURL" );
aArgs[2].Name = "DocumentBaseURL";
aArgs[2].Value <<= aBaseURL;
aArgs[1].Name = OUString( "HierarchicalDocumentName" );
aArgs[1].Name = "HierarchicalDocumentName";
aArgs[1].Value <<= aHierarchName;
xDoc->storeToStorage( xStorage, aArgs );
@@ -866,21 +866,21 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_
SAL_WARN_IF( aTempFileURL.isEmpty(), "embeddedobj.common", "Couldn't retrieve temporary file URL!" );
aTempMediaDescr[0].Name = OUString( "URL" );
aTempMediaDescr[0].Name = "URL";
aTempMediaDescr[0].Value <<= aTempFileURL;
aTempMediaDescr[1].Name = OUString( "InputStream" );
aTempMediaDescr[1].Name = "InputStream";
aTempMediaDescr[1].Value <<= xTempStream;
aTempMediaDescr[2].Name = OUString( "FilterName" );
aTempMediaDescr[2].Name = "FilterName";
aTempMediaDescr[2].Value <<= GetFilterName( nStorageFormat );
aTempMediaDescr[3].Name = OUString( "AsTemplate" );
aTempMediaDescr[3].Name = "AsTemplate";
aTempMediaDescr[3].Value <<= sal_True;
}
else
{
aTempMediaDescr.realloc( 2 );
aTempMediaDescr[0].Name = OUString( "URL" );
aTempMediaDescr[0].Name = "URL";
aTempMediaDescr[0].Value <<= m_aLinkURL;
aTempMediaDescr[1].Name = OUString( "FilterName" );
aTempMediaDescr[1].Name = "FilterName";
aTempMediaDescr[1].Value <<= m_aLinkFilterName;
}
@@ -1692,7 +1692,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
else
{
uno::Sequence< beans::PropertyValue > aArgs( 1 );
aArgs[0].Name = OUString( "URL" );
aArgs[0].Name = "URL";
aArgs[0].Value <<= m_aLinkURL;
m_aLinkFilterName = aHelper.UpdateMediaDescriptorWithFilterName( aArgs, sal_False );
}
embeddedobj/source/msole/graphconvert.cxx
+3 -3
View File
@@ -54,7 +54,7 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
{
uno::Reference < graphic::XGraphicProvider > xGraphicProvider( graphic::GraphicProvider::create(comphelper::getProcessComponentContext()));
uno::Sequence< beans::PropertyValue > aMediaProperties( 1 );
aMediaProperties[0].Name = OUString( "InputStream" );
aMediaProperties[0].Name = "InputStream";
aMediaProperties[0].Value <<= xIn;
uno::Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) );
if( xGraphic.is() )
@@ -62,9 +62,9 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
SvMemoryStream aNewStream( 65535, 65535 );
uno::Reference < io::XStream > xOut = new utl::OStreamWrapper( aNewStream );
uno::Sequence< beans::PropertyValue > aOutMediaProperties( 2 );
aOutMediaProperties[0].Name = OUString( "OutputStream" );
aOutMediaProperties[0].Name = "OutputStream";
aOutMediaProperties[0].Value <<= xOut;
aOutMediaProperties[1].Name = OUString( "MimeType" );
aOutMediaProperties[1].Name = "MimeType";
aOutMediaProperties[1].Value <<= aMimeType;
xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties );
embeddedobj/source/msole/oleembed.cxx
+8 -12
View File
@@ -207,9 +207,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage(
for ( sal_Int32 nInd = 0; nInd < 32000 && !xResult.is(); nInd++ )
{
OUString aName = OUString::number( nInd );
aName += OUString( "TMPSTOR" );
aName += m_aEntryName;
OUString aName = OUString::number( nInd ) + "TMPSTOR" + m_aEntryName;
if ( !m_xParentStorage->hasByName( aName ) )
{
xResult = m_xParentStorage->openStorageElement( aName, embed::ElementModes::READWRITE );
@@ -232,9 +230,7 @@ OUString OleEmbeddedObject::MoveToTemporarySubstream()
OUString aResult;
for ( sal_Int32 nInd = 0; nInd < 32000 && aResult.isEmpty(); nInd++ )
{
OUString aName = OUString::number( nInd );
aName += OUString( "TMPSTREAM" );
aName += m_aEntryName;
OUString aName = OUString::number( nInd ) + "TMPSTREAM" + m_aEntryName;
if ( !m_xParentStorage->hasByName( aName ) )
{
m_xParentStorage->renameElement( m_aEntryName, aName );
@@ -300,21 +296,21 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
// let the model behave as embedded one
uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW );
uno::Sequence< beans::PropertyValue > aSeq( 1 );
aSeq[0].Name = OUString( "SetEmbedded" );
aSeq[0].Name = "SetEmbedded";
aSeq[0].Value <<= sal_True;
xModel->attachResource( OUString(), aSeq );
// load the model from the stream
uno::Sequence< beans::PropertyValue > aArgs( 5 );
aArgs[0].Name = OUString( "HierarchicalDocumentName" );
aArgs[0].Name = "HierarchicalDocumentName";
aArgs[0].Value <<= m_aEntryName;
aArgs[1].Name = OUString( "ReadOnly" );
aArgs[1].Name = "ReadOnly";
aArgs[1].Value <<= sal_True;
aArgs[2].Name = OUString( "FilterName" );
aArgs[2].Name = "FilterName";
aArgs[2].Value <<= aFilterName;
aArgs[3].Name = OUString( "URL" );
aArgs[3].Name = "URL";
aArgs[3].Value <<= OUString( "private:stream" );
aArgs[4].Name = OUString( "InputStream" );
aArgs[4].Name = "InputStream";
aArgs[4].Value <<= m_xObjectStream->getInputStream();
xSeekable->seek( 0 );
embeddedobj/source/msole/olepersist.cxx
+5 -8
View File
@@ -500,7 +500,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
throw io::IOException(); // TODO:
// insert the result file as replacement image
OUString aCacheName = OUString( "\002OlePres000" );
OUString aCacheName = "\002OlePres000";
if ( xNameContainer->hasByName( aCacheName ) )
xNameContainer->replaceByName( aCacheName, uno::makeAny( xTempFile ) );
else
@@ -535,8 +535,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea
for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
{
OUString aStreamName( "\002OlePres00" );
aStreamName += OUString::number( nInd );
OUString aStreamName = "\002OlePres00" + OUString::number( nInd );
if ( xNameContainer->hasByName( aStreamName ) )
xNameContainer->removeByName( aStreamName );
}
@@ -603,8 +602,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
{
for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ )
{
OUString aStreamName( "\002OlePres00" );
aStreamName += OUString::number( nInd );
OUString aStreamName = "\002OlePres00" + OUString::number( nInd );
try
{
bExists = xNameContainer->hasByName( aStreamName );
@@ -653,8 +651,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
{
for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
{
OUString aStreamName( "\002OlePres00" );
aStreamName += OUString::number( nInd );
OUString aStreamName = "\002OlePres00" + OUString::number( nInd );
uno::Reference< io::XStream > xCachedCopyStream;
try
{
@@ -671,7 +668,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
if ( nInd == 0 )
{
// to be compatible with the old versions Ole10Native is checked after OlePress000
aStreamName = OUString( "\001Ole10Native" );
aStreamName = "\001Ole10Native";
try
{
if ( ( xNameContainer->getByName( aStreamName ) >>= xCachedCopyStream ) && xCachedCopyStream.is() )
embeddedobj/source/msole/ownview.cxx
+9 -9
View File
@@ -120,22 +120,22 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
uno::Sequence< beans::PropertyValue > aArgs( m_aFilterName.isEmpty() ? 4 : 5 );
aArgs[0].Name = OUString( "URL" );
aArgs[0].Name = "URL";
aArgs[0].Value <<= aFileURL;
aArgs[1].Name = OUString( "ReadOnly" );
aArgs[1].Name = "ReadOnly";
aArgs[1].Value <<= sal_True;
aArgs[2].Name = OUString( "InteractionHandler" );
aArgs[2].Name = "InteractionHandler";
aArgs[2].Value <<= uno::Reference< task::XInteractionHandler >(
static_cast< ::cppu::OWeakObject* >( new DummyHandler_Impl() ), uno::UNO_QUERY );
aArgs[3].Name = OUString( "DontEdit" );
aArgs[3].Name = "DontEdit";
aArgs[3].Value <<= sal_True;
if ( !m_aFilterName.isEmpty() )
{
aArgs[4].Name = OUString( "FilterName" );
aArgs[4].Name = "FilterName";
aArgs[4].Value <<= m_aFilterName;
}
@@ -215,13 +215,13 @@ OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream(
}
uno::Sequence< beans::PropertyValue > aArgs( aTypeName.isEmpty() ? 2 : 3 );
aArgs[0].Name = OUString( "URL" );
aArgs[0].Name = "URL";
aArgs[0].Value <<= OUString( "private:stream" );
aArgs[1].Name = OUString( "InputStream" );
aArgs[1].Name = "InputStream";
aArgs[1].Value <<= xInputStream;
if ( !aTypeName.isEmpty() )
{
aArgs[2].Name = OUString( "TypeName" );
aArgs[2].Name = "TypeName";
aArgs[2].Value <<= aTypeName;
}
@@ -425,7 +425,7 @@ void OwnView_Impl::CreateNative()
aArgs ),
uno::UNO_QUERY_THROW );
OUString aSubStreamName = OUString( "\1Ole10Native" );
OUString aSubStreamName = "\1Ole10Native";
uno::Reference< embed::XClassifiedObject > xStor( xNameAccess, uno::UNO_QUERY_THROW );
uno::Sequence< sal_Int8 > aStorClassID = xStor->getClassID();
embedserv/source/embed/docholder.cxx
+1 -1
View File
@@ -718,7 +718,7 @@ void DocumentHolder::SetDocument( const uno::Reference< frame::XModel >& xDoc, s
{
// set the document mode to embedded
uno::Sequence< beans::PropertyValue > aSeq(1);
aSeq[0].Name = OUString( "SetEmbedded" );
aSeq[0].Name = "SetEmbedded";
aSeq[0].Value <<= sal_True;
m_xDocument->attachResource(OUString(),aSeq);
}
embedserv/source/embed/ed_ipersiststr.cxx
+7 -7
View File
@@ -204,19 +204,19 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp
uno::Sequence< beans::PropertyValue > aArgs( 3 );
sal_Int32 nInd = 0; // must not be bigger than the preset size
aArgs[nInd].Name = OUString( "FilterName" );
aArgs[nInd].Name = "FilterName";
aArgs[nInd++].Value <<= getFilterNameFromGUID_Impl( &m_guid );
if ( xStream.is() )
{
aArgs[nInd].Name = OUString( "InputStream" );
aArgs[nInd].Name = "InputStream";
aArgs[nInd++].Value <<= xStream;
aArgs[nInd].Name = OUString( "URL" );
aArgs[nInd].Name = "URL";
aArgs[nInd++].Value <<= OUString( "private:stream" );
}
else
{
aArgs[nInd].Name = OUString( "URL" );
aArgs[nInd].Name = "URL";
OUString sDocUrl;
if ( pFilePath )
@@ -235,7 +235,7 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp
aArgs.realloc( nInd );
// aArgs[].Name = OUString( "ReadOnly" );
// aArgs[].Name = "ReadOnly";
// aArgs[].Value <<= sal_False; //( ( nStreamMode & ( STGM_READWRITE | STGM_WRITE ) ) ? sal_True : sal_False );
return aArgs;
@@ -245,12 +245,12 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForStoring_Imp
{
uno::Sequence< beans::PropertyValue > aArgs( xStream.is() ? 2 : 1 );
aArgs[0].Name = OUString( "FilterName" );
aArgs[0].Name = "FilterName";
aArgs[0].Value <<= getFilterNameFromGUID_Impl( &m_guid );
if ( xStream.is() )
{
aArgs[1].Name = OUString( "OutputStream" );
aArgs[1].Name = "OutputStream";
aArgs[1].Value <<= xStream;
}
embedserv/source/embed/register.cxx
+1 -1
View File
@@ -52,7 +52,7 @@ OUString SAL_CALL EmbedServer_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw()
{
uno::Sequence< OUString > aServiceNames( 1 );
aServiceNames[0] = OUString( "com.sun.star.document.OleEmbeddedServerRegistration" );
aServiceNames[0] = "com.sun.star.document.OleEmbeddedServerRegistration";
return aServiceNames;
}
extensions/source/logging/consolehandler.cxx
+1 -1
View File
@@ -296,7 +296,7 @@ namespace logging
Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static()
{
Sequence< OUString > aServiceNames(1);
aServiceNames[0] = OUString( "com.sun.star.logging.ConsoleHandler" );
aServiceNames[0] = "com.sun.star.logging.ConsoleHandler";
return aServiceNames;
}
extensions/source/logging/filehandler.cxx
+1 -1
View File
@@ -398,7 +398,7 @@ namespace logging
Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames_static()
{
Sequence< OUString > aServiceNames(1);
aServiceNames[0] = OUString( "com.sun.star.logging.FileHandler" );
aServiceNames[0] = "com.sun.star.logging.FileHandler";
return aServiceNames;
}
extensions/source/logging/logger.cxx
+1 -1
View File
@@ -293,7 +293,7 @@ namespace logging
Sequence< OUString > SAL_CALL EventLogger::getSupportedServiceNames() throw(RuntimeException)
{
Sequence< OUString > aServiceNames(1);
aServiceNames[0] = OUString( "com.sun.star.logging.Logger" );
aServiceNames[0] = "com.sun.star.logging.Logger";
return aServiceNames;
}
extensions/source/logging/plaintextformatter.cxx
+1 -1
View File
@@ -178,7 +178,7 @@ namespace logging
Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static()
{
Sequence< OUString > aServiceNames(1);
aServiceNames[0] = OUString( "com.sun.star.logging.PlainTextFormatter" );
aServiceNames[0] = "com.sun.star.logging.PlainTextFormatter";
return aServiceNames;
}
extensions/source/propctrlr/browserline.cxx
+1 -1
View File
@@ -408,7 +408,7 @@ namespace pcr
Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create(xContext) );
Sequence< PropertyValue > aMediaProperties(1);
aMediaProperties[0].Name = OUString( "URL" );
aMediaProperties[0].Name = "URL";
aMediaProperties[0].Value <<= _rImageURL;
Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW );
extensions/source/propctrlr/buttonnavigationhandler.cxx
+1 -1
View File
@@ -72,7 +72,7 @@ namespace pcr
Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< OUString > aSupported( 1 );
aSupported[0] = OUString( "com.sun.star.form.inspection.ButtonNavigationHandler" );
aSupported[0] = "com.sun.star.form.inspection.ButtonNavigationHandler";
return aSupported;
}
extensions/source/propctrlr/cellbindinghandler.cxx
+1 -1
View File
@@ -70,7 +70,7 @@ namespace pcr
Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< OUString > aSupported( 1 );
aSupported[0] = OUString( "com.sun.star.form.inspection.CellBindingPropertyHandler" );
aSupported[0] = "com.sun.star.form.inspection.CellBindingPropertyHandler";
return aSupported;
}
extensions/source/propctrlr/editpropertyhandler.cxx
+1 -1
View File
@@ -73,7 +73,7 @@ namespace pcr
Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< OUString > aSupported( 1 );
aSupported[0] = OUString( "com.sun.star.form.inspection.EditPropertyHandler" );
aSupported[0] = "com.sun.star.form.inspection.EditPropertyHandler";
return aSupported;
}
extensions/source/propctrlr/eformspropertyhandler.cxx
+2 -2
View File
@@ -81,7 +81,7 @@ namespace pcr
Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< OUString > aSupported( 1 );
aSupported[0] = OUString( "com.sun.star.form.inspection.XMLFormsPropertyHandler" );
aSupported[0] = "com.sun.star.form.inspection.XMLFormsPropertyHandler";
return aSupported;
}
@@ -468,7 +468,7 @@ namespace pcr
}
aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId );
aDescriptor.Category = OUString( "Data" );
aDescriptor.Category = "Data";
aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) );
return aDescriptor;
}
extensions/source/propctrlr/formcomponenthandler.cxx
+1 -1
View File
@@ -169,7 +169,7 @@ namespace pcr
Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< OUString > aSupported( 1 );
aSupported[0] = OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" );
aSupported[0] = "com.sun.star.form.inspection.FormComponentPropertyHandler";
return aSupported;
}
extensions/source/propctrlr/formgeometryhandler.cxx
+1 -1
View File
@@ -323,7 +323,7 @@ namespace pcr
Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< OUString > aSupported( 1 );
aSupported[0] = OUString( "com.sun.star.form.inspection.FormGeometryHandler" );
aSupported[0] = "com.sun.star.form.inspection.FormGeometryHandler";
return aSupported;
}
extensions/source/propctrlr/pcrunodialogs.cxx
+2 -2
View File
@@ -99,8 +99,8 @@ namespace pcr
::comphelper::StringSequence OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(2);
aSupported.getArray()[0] = OUString( "com.sun.star.form.ui.TabOrderDialog" );
aSupported.getArray()[1] = OUString( "com.sun.star.form.TabOrderDialog" );
aSupported.getArray()[0] = "com.sun.star.form.ui.TabOrderDialog";
aSupported.getArray()[1] = "com.sun.star.form.TabOrderDialog";
return aSupported;
}
extensions/source/propctrlr/propertyhandler.cxx
+12 -12
View File
@@ -219,9 +219,9 @@ namespace pcr
aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId );
if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_DATA_PROPERTY ) != 0 )
aDescriptor.Category = OUString( "Data" );
aDescriptor.Category = "Data";
else
aDescriptor.Category = OUString( "General" );
aDescriptor.Category = "General";
return aDescriptor;
}
@@ -379,28 +379,28 @@ namespace pcr
OUString sConfigurationProperty;
if ( xDocumentSI->supportsService( SERVICE_WEB_DOCUMENT ) )
{ // writer
sConfigurationLocation = OUString( "/org.openoffice.Office.WriterWeb/Layout/Other" );
sConfigurationProperty = OUString( "MeasureUnit" );
sConfigurationLocation = "/org.openoffice.Office.WriterWeb/Layout/Other";
sConfigurationProperty = "MeasureUnit";
}
else if ( xDocumentSI->supportsService( SERVICE_TEXT_DOCUMENT ) )
{ // writer
sConfigurationLocation = OUString( "/org.openoffice.Office.Writer/Layout/Other" );
sConfigurationProperty = OUString( "MeasureUnit" );
sConfigurationLocation = "/org.openoffice.Office.Writer/Layout/Other";
sConfigurationProperty = "MeasureUnit";
}
else if ( xDocumentSI->supportsService( SERVICE_SPREADSHEET_DOCUMENT ) )
{ // calc
sConfigurationLocation = OUString( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" );
sConfigurationProperty = OUString( "Metric" );
sConfigurationLocation = "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit";
sConfigurationProperty = "Metric";
}
else if ( xDocumentSI->supportsService( SERVICE_DRAWING_DOCUMENT ) )
{
sConfigurationLocation = OUString( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" );
sConfigurationProperty = OUString( "Metric" );
sConfigurationLocation = "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit";
sConfigurationProperty = "Metric";
}
else if ( xDocumentSI->supportsService( SERVICE_PRESENTATION_DOCUMENT ) )
{
sConfigurationLocation = OUString( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" );
sConfigurationProperty = OUString( "Metric" );
sConfigurationLocation = "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit";
sConfigurationProperty = "Metric";
}
// read the measurement unit from the configuration
extensions/source/propctrlr/sqlcommanddesign.cxx
+1 -1
View File
@@ -243,7 +243,7 @@ namespace pcr
aArgs[3].Name = PROPERTY_ESCAPE_PROCESSING;
aArgs[3].Value <<= m_xObjectAdapter->getEscapeProcessing();
aArgs[4].Name = OUString( "GraphicalDesign" );
aArgs[4].Name = "GraphicalDesign";
aArgs[4].Value <<= m_xObjectAdapter->getEscapeProcessing();
Reference< XComponent > xQueryDesign = xLoader->loadComponentFromURL(
extensions/source/propctrlr/submissionhandler.cxx
+2 -2
View File
@@ -113,7 +113,7 @@ namespace pcr
Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< OUString > aSupported( 1 );
aSupported[0] = OUString( "com.sun.star.form.inspection.SubmissionPropertyHandler" );
aSupported[0] = "com.sun.star.form.inspection.SubmissionPropertyHandler";
return aSupported;
}
@@ -312,7 +312,7 @@ namespace pcr
LineDescriptor aDescriptor;
aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, sal_False, sal_True );
aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId );
aDescriptor.Category = OUString( "General" );
aDescriptor.Category = "General";
aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) );
return aDescriptor;
}
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+4 -4
View File
@@ -95,7 +95,7 @@ namespace pcr
Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< OUString > aSupported( 1 );
aSupported[0] = OUString( "com.sun.star.form.inspection.XSDValidationPropertyHandler" );
aSupported[0] = "com.sun.star.form.inspection.XSDValidationPropertyHandler";
return aSupported;
}
@@ -323,8 +323,8 @@ namespace pcr
aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE);
aDescriptor.SecondaryButtonId = OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);;
aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True;
aDescriptor.PrimaryButtonImageURL = OUString( "private:graphicrepository/extensions/res/buttonplus.png" );
aDescriptor.SecondaryButtonImageURL = OUString( "private:graphicrepository/extensions/res/buttonminus.png" );
aDescriptor.PrimaryButtonImageURL = "private:graphicrepository/extensions/res/buttonplus.png";
aDescriptor.SecondaryButtonImageURL = "private:graphicrepository/extensions/res/buttonminus.png";
break;
case PROPERTY_ID_XSD_WHITESPACES:
@@ -419,7 +419,7 @@ namespace pcr
break;
}
aDescriptor.Category = OUString( "Data" );
aDescriptor.Category = "Data";
aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId );
aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) );
extensions/source/scanner/scanner.cxx
+1 -1
View File
@@ -88,7 +88,7 @@ Sequence< OUString > ScannerManager::getSupportedServiceNames_Static() throw ()
{
Sequence< OUString > aSNS( 1 );
aSNS.getArray()[0] = OUString( "com.sun.star.scanner.ScannerManager" );
aSNS.getArray()[0] = "com.sun.star.scanner.ScannerManager";
return aSNS;
}
extensions/source/scanner/scanwin.cxx
+4 -4
View File
@@ -866,7 +866,7 @@ uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners()
osl::MutexGuard aGuard( maProtector );
uno::Sequence< ScannerContext > aRet( 1 );
aRet.getArray()[0].ScannerName = OUString( "TWAIN" );
aRet.getArray()[0].ScannerName = "TWAIN" ;
aRet.getArray()[0].InternalData = 0;
return aRet;
@@ -878,7 +878,7 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rCont
osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) )
if( rContext.InternalData != 0 || rContext.ScannerName != "TWAIN" )
throw ScannerException("Scanner does not exist", xThis, ScanError_InvalidContext );
ReleaseData();
@@ -892,7 +892,7 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u
osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) )
if( rContext.InternalData != 0 || rContext.ScannerName != "TWAIN" )
throw ScannerException("Scanner does not exist", xThis, ScanError_InvalidContext );
ReleaseData();
@@ -905,7 +905,7 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) )
if( rContext.InternalData != 0 || rContext.ScannerName != "TWAIN" )
throw ScannerException("Scanner does not exist", xThis, ScanError_InvalidContext );
return( ( aTwain.GetState() == TWAIN_STATE_CANCELED ) ? ScanError_ScanCanceled : ScanError_ScanErrorNone );
filter/source/config/cache/filterfactory.cxx
Vendored
+8 -8
View File
@@ -259,37 +259,37 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
if ( sDocumentService == "writer" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = OUString( "com.sun.star.text.TextDocument" );
sDocumentService = "com.sun.star.text.TextDocument";
}
else if ( sDocumentService == "web" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = OUString( "com.sun.star.text.WebDocument" );
sDocumentService = "com.sun.star.text.WebDocument";
}
else if ( sDocumentService == "global" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = OUString( "com.sun.star.text.GlobalDocument" );
sDocumentService = "com.sun.star.text.GlobalDocument";
}
else if ( sDocumentService == "calc" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = OUString( "com.sun.star.sheet.SpreadsheetDocument" );
sDocumentService = "com.sun.star.sheet.SpreadsheetDocument";
}
else if ( sDocumentService == "draw" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = OUString( "com.sun.star.drawing.DrawingDocument" );
sDocumentService = "com.sun.star.drawing.DrawingDocument";
}
else if ( sDocumentService == "impress" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = OUString( "com.sun.star.presentation.PresentationDocument" );
sDocumentService = "com.sun.star.presentation.PresentationDocument";
}
else if ( sDocumentService == "math" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = OUString( "com.sun.star.formula.FormulaProperties" );
sDocumentService = "com.sun.star.formula.FormulaProperties";
}
#endif
@@ -582,7 +582,7 @@ OUString FilterFactory::impl_getImplementationName()
css::uno::Sequence< OUString > FilterFactory::impl_getSupportedServiceNames()
{
css::uno::Sequence< OUString > lServiceNames(1);
lServiceNames[0] = OUString( "com.sun.star.document.FilterFactory" );
lServiceNames[0] = "com.sun.star.document.FilterFactory";
return lServiceNames;
}
filter/source/config/cache/typedetection.cxx
Vendored
+1 -1
View File
@@ -1232,7 +1232,7 @@ OUString TypeDetection::impl_getImplementationName()
css::uno::Sequence< OUString > TypeDetection::impl_getSupportedServiceNames()
{
css::uno::Sequence< OUString > lServiceNames(1);
lServiceNames[0] = OUString( "com.sun.star.document.TypeDetection" );
lServiceNames[0] = "com.sun.star.document.TypeDetection";
return lServiceNames;
}
filter/source/graphic/GraphicExportDialog.cxx
+6 -6
View File
@@ -70,7 +70,7 @@ Sequence<PropertyValue> GraphicExportDialog::getPropertyValues() throw ( Runtime
maMediaDescriptor.realloc( nCount );
}
maMediaDescriptor[ i ].Name = OUString( "FilterData" );
maMediaDescriptor[ i ].Name = "FilterData";
maMediaDescriptor[ i ].Value <<= maFilterDataSequence;
return maMediaDescriptor;
}
@@ -128,15 +128,15 @@ void GraphicExportDialog::setSourceDocument( const Reference<XComponent>& xDocum
{
if ( xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument") )
{
aConfigPath = OUString( "Office.Impress/Layout/Other/MeasureUnit" );
aConfigPath = "Office.Impress/Layout/Other/MeasureUnit";
}
else if ( xServiceInfo->supportsService("com.sun.star.drawing.DrawingDocument") )
{
aConfigPath = OUString( "Office.Draw/Layout/Other/MeasureUnit" );
aConfigPath = "Office.Draw/Layout/Other/MeasureUnit";
}
else if ( xServiceInfo->supportsService("com.sun.star.text.TextDocument") )
{
aConfigPath = OUString( "Office.Writer/Layout/Other/MeasureUnit" );
aConfigPath = "Office.Writer/Layout/Other/MeasureUnit";
}
if ( !aConfigPath.isEmpty() )
{
@@ -146,11 +146,11 @@ void GraphicExportDialog::setSourceDocument( const Reference<XComponent>& xDocum
if ( aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum() == MEASURE_METRIC )
{
aPropertyName = OUString( "Metric" );
aPropertyName = "Metric";
}
else
{
aPropertyName = OUString( "NonMetric" );
aPropertyName = "NonMetric";
}
meFieldUnit = (FieldUnit) aConfigItem.ReadInt32( aPropertyName, FUNIT_CM );
}
filter/source/msfilter/escherex.cxx
+2 -2
View File
@@ -4308,10 +4308,10 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
aGIFStream.Seek( STREAM_SEEK_TO_BEGIN );
aGIFStream.Read( pSeq, nGIFSreamLen );
com::sun::star::beans::PropertyValue aChunkProp, aFilterProp;
aChunkProp.Name = OUString( "msOG" );
aChunkProp.Name = "msOG";
aChunkProp.Value <<= aGIFSeq;
aAdditionalChunkSequence[ 0 ] = aChunkProp;
aFilterProp.Name = OUString( "AdditionalChunks" );
aFilterProp.Name = "AdditionalChunks";
aFilterProp.Value <<= aAdditionalChunkSequence;
aFilterData[ 0 ] = aFilterProp;
nErrCode = rFilter.ExportGraphic( aGraphic, OUString(), aStream,
filter/source/msfilter/msdffimp.cxx
+3 -3
View File
@@ -6881,15 +6881,15 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS
aFilterName = GetFilterNameFromClassID_Impl( aStgNm );
uno::Sequence < beans::PropertyValue > aMedium( aFilterName.isEmpty() ? 2 : 3);
aMedium[0].Name = OUString( "InputStream" );
aMedium[0].Name = "InputStream";
uno::Reference < io::XInputStream > xStream = new ::utl::OSeekableInputStreamWrapper( *xMemStream );
aMedium[0].Value <<= xStream;
aMedium[1].Name = OUString( "URL" );
aMedium[1].Name = "URL";
aMedium[1].Value <<= OUString( "private:stream" );
if ( !aFilterName.isEmpty() )
{
aMedium[2].Name = OUString( "FilterName" );
aMedium[2].Name = "FilterName";
aMedium[2].Value <<= aFilterName;
}
filter/source/msfilter/msoleexp.cxx
+3 -3
View File
@@ -191,10 +191,10 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
//TODO/LATER: a "StoreTo" method at embedded object would be nice
uno::Sequence < beans::PropertyValue > aSeq(2);
SvStream* pStream = new SvMemoryStream;
aSeq[0].Name = OUString( "OutputStream" );
aSeq[0].Name = "OutputStream";
::uno::Reference < io::XOutputStream > xOut = new ::utl::OOutputStreamWrapper( *pStream );
aSeq[0].Value <<= xOut;
aSeq[1].Name = OUString( "FilterName" );
aSeq[1].Name = "FilterName";
aSeq[1].Value <<= OUString( pExpFilter->GetName() );
uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
try
@@ -291,7 +291,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
//TODO/LATER: is stream instead of outputstream a better choice?!
//TODO/LATER: a "StoreTo" method at embedded object would be nice
uno::Sequence < beans::PropertyValue > aSeq(1);
aSeq[0].Name = OUString( "OutputStream" );
aSeq[0].Name = "OutputStream";
::uno::Reference < io::XOutputStream > xOut = new ::utl::OOutputStreamWrapper( *xEmbStm );
aSeq[0].Value <<= xOut;
uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
filter/source/odfflatxml/OdfFlatXml.cxx
+2 -2
View File
@@ -190,8 +190,8 @@ OUString OdfFlatXml::impl_getImplementationName()
Sequence< OUString > OdfFlatXml::impl_getSupportedServiceNames()
{
Sequence< OUString > lServiceNames(2);
lServiceNames[0] = OUString( "com.sun.star.document.ImportFilter" );
lServiceNames[1] = OUString( "com.sun.star.document.ExportFilter" );
lServiceNames[0] = "com.sun.star.document.ImportFilter";
lServiceNames[1] = "com.sun.star.document.ExportFilter";
return lServiceNames;
}
filter/source/xmlfilterdetect/filterdetect.cxx
+2 -2
View File
@@ -106,7 +106,7 @@ bool isXMLStream(const OString& aHeaderStrm)
OUString supportedByType( const OUString clipBoardFormat , const OString resultString, const OUString checkType)
{
OUString sTypeName;
if ( clipBoardFormat.match(OUString("doctype:")) )
if ( clipBoardFormat.match("doctype:") )
{
OString tryStr = OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr();
if (resultString.indexOf(tryStr) >= 0)
@@ -207,7 +207,7 @@ OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun:
if (location == aArguments.getLength())
{
aArguments.realloc(nLength+1);
aArguments[location].Name = OUString( "TypeName" );
aArguments[location].Name = "TypeName";
}
aArguments[location].Value <<=sTypeName;
}
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+1 -1
View File
@@ -198,7 +198,7 @@ OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeExcepti
Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames() throw ( RuntimeException )
{
Sequence< OUString > aSupported(1);
aSupported[0] = OUString( "com.sun.star.ui.dialogs.XSLTFilterDialog" );
aSupported[0] = "com.sun.star.ui.dialogs.XSLTFilterDialog";
return aSupported;
}
filter/source/xsltdialog/xmlfilterjar.cxx
+2 -2
View File
@@ -152,7 +152,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
// let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg;
aArg.Name = OUString( "StorageFormat" );
aArg.Name = "StorageFormat";
aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
aArguments[ 1 ] <<= aArg;
@@ -251,7 +251,7 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
// let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg;
aArg.Name = OUString( "StorageFormat" );
aArg.Name = "StorageFormat";
aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
aArguments[ 1 ] <<= aArg;
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+3 -3
View File
@@ -1507,9 +1507,9 @@ OUString XMLFilterListBox::getEntryString( const filter_info_impl* pInfo ) const
{
OUString aEntryStr( pInfo->maFilterName + "\t");
if ( !pInfo->maExportService.isEmpty() )
aEntryStr += OUString( getApplicationUIName( pInfo->maExportService ) );
aEntryStr += getApplicationUIName( pInfo->maExportService );
else
aEntryStr += OUString( getApplicationUIName( pInfo->maImportService ) );
aEntryStr += getApplicationUIName( pInfo->maImportService );
aEntryStr += " - ";
if( pInfo->maFlags & 1 )
@@ -1604,7 +1604,7 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const
{
Sequence< OUString > aUserData(8);
aUserData[0] = OUString( "com.sun.star.documentconversion.XSLTFilter" );
aUserData[0] = "com.sun.star.documentconversion.XSLTFilter";
aUserData[1] = OUString::boolean( mbNeedsXSLT2 );
aUserData[2] = maImportService;
aUserData[3] = maExportService;
filter/source/xsltfilter/XSLTFilter.cxx
+9 -13
View File
@@ -319,13 +319,13 @@ namespace XSLT
Sequence<Any> args(3);
NamedValue nv;
nv.Name = OUString( "StylesheetURL" );
nv.Name = "StylesheetURL";
nv.Value <<= expandUrl(udStyleSheet);
args[0] <<= nv;
nv.Name = OUString( "SourceURL" );
nv.Name = "SourceURL";
nv.Value <<= aURL;
args[1] <<= nv;
nv.Name = OUString( "SourceBaseURL" );
nv.Name = "SourceBaseURL";
nv.Value <<= OUString(INetURLObject(aURL).getBase());
args[2] <<= nv;
@@ -461,16 +461,16 @@ namespace XSLT
// create transformer
Sequence<Any> args(4);
NamedValue nv;
nv.Name = OUString( "StylesheetURL" );
nv.Name = "StylesheetURL";
nv.Value <<= expandUrl(udStyleSheet);
args[0] <<= nv;
nv.Name = OUString( "TargetURL" );
nv.Name = "TargetURL";
nv.Value <<= sURL;
args[1] <<= nv;
nv.Name = OUString( "DoctypePublic" );
nv.Name = "DoctypePublic";
nv.Value <<= aDoctypePublic;
args[2] <<= nv;
nv.Name = OUString( "TargetBaseURL" );
nv.Name = "TargetBaseURL";
INetURLObject ineturl(sURL);
ineturl.removeSegment();
m_aExportBaseUrl = ineturl.GetMainURL(INetURLObject::NO_DECODE);
@@ -581,9 +581,7 @@ extern "C"
if (rtl_str_compare(pImplName, FILTER_IMPL_NAME) == 0)
{
Sequence<OUString> serviceNames(1);
serviceNames.getArray()[0]
= OUString(
FILTER_SERVICE_NAME );
serviceNames.getArray()[0] = FILTER_SERVICE_NAME;
css::uno::Reference<XSingleServiceFactory>
xFactory(
@@ -603,9 +601,7 @@ extern "C"
else if (rtl_str_compare(pImplName, TRANSFORMER_IMPL_NAME) == 0)
{
Sequence<OUString> serviceNames(1);
serviceNames.getArray()[0]
= OUString(
TRANSFORMER_SERVICE_NAME );
serviceNames.getArray()[0] = TRANSFORMER_SERVICE_NAME;
css::uno::Reference<XSingleServiceFactory>
xFactory(
createSingleFactory(
forms/source/component/Columns.cxx
+10 -10
View File
@@ -70,16 +70,16 @@ const StringSequence& getColumnTypes()
if (aColumnTypes.getConstArray()[0].isEmpty())
{
OUString* pNames = aColumnTypes.getArray();
pNames[TYPE_CHECKBOX] = OUString( "CheckBox" );
pNames[TYPE_COMBOBOX] = OUString( "ComboBox" );
pNames[TYPE_CURRENCYFIELD] = OUString( "CurrencyField" );
pNames[TYPE_DATEFIELD] = OUString( "DateField" );
pNames[TYPE_FORMATTEDFIELD] = OUString( "FormattedField" );
pNames[TYPE_LISTBOX] = OUString( "ListBox" );
pNames[TYPE_NUMERICFIELD] = OUString( "NumericField" );
pNames[TYPE_PATTERNFIELD] = OUString( "PatternField" );
pNames[TYPE_TEXTFIELD] = OUString( "TextField" );
pNames[TYPE_TIMEFIELD] = OUString( "TimeField" );
pNames[TYPE_CHECKBOX] = "CheckBox";
pNames[TYPE_COMBOBOX] = "ComboBox";
pNames[TYPE_CURRENCYFIELD] = "CurrencyField";
pNames[TYPE_DATEFIELD] = "DateField";
pNames[TYPE_FORMATTEDFIELD] = "FormattedField";
pNames[TYPE_LISTBOX] = "ListBox";
pNames[TYPE_NUMERICFIELD] = "NumericField";
pNames[TYPE_PATTERNFIELD] = "PatternField";
pNames[TYPE_TEXTFIELD] = "TextField";
pNames[TYPE_TIMEFIELD] = "TimeField";
}
return aColumnTypes;
}
forms/source/component/ImageControl.cxx
+1 -1
View File
@@ -295,7 +295,7 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con
OUString sNewImageURL;
if ( m_xGraphicObject.is() )
{
sNewImageURL = OUString( "vnd.sun.star.GraphicObject:" );
sNewImageURL = "vnd.sun.star.GraphicObject:";
sNewImageURL = sNewImageURL + m_xGraphicObject->getUniqueID();
}
m_sImageURL = sNewImageURL;
forms/source/component/navigationbar.cxx
+1 -1
View File
@@ -184,7 +184,7 @@ namespace frm
aSupported.realloc( aSupported.getLength() + 2 );
OUString* pArray = aSupported.getArray();
pArray[ aSupported.getLength() - 2 ] = OUString( "com.sun.star.awt.UnoControlModel" );
pArray[ aSupported.getLength() - 2 ] = "com.sun.star.awt.UnoControlModel";
pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_NAVTOOLBAR;
return aSupported;
}
forms/source/richtext/clipboarddispatcher.cxx
+3 -3
View File
@@ -44,13 +44,13 @@ namespace frm
switch ( _eFunc )
{
case OClipboardDispatcher::eCut:
aURL.Complete = OUString( ".uno:Cut" );
aURL.Complete = ".uno:Cut";
break;
case OClipboardDispatcher::eCopy:
aURL.Complete = OUString( ".uno:Copy" );
aURL.Complete = ".uno:Copy";
break;
case OClipboardDispatcher::ePaste:
aURL.Complete = OUString( ".uno:Paste" );
aURL.Complete = ".uno:Paste";
break;
}
return aURL;
forms/source/richtext/richtextcontrol.cxx
+2 -2
View File
@@ -273,8 +273,8 @@ namespace frm
Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 3 );
aServices[ 0 ] = OUString( "com.sun.star.awt.UnoControl" );
aServices[ 1 ] = OUString( "com.sun.star.awt.UnoControlEdit" );
aServices[ 0 ] = "com.sun.star.awt.UnoControl";
aServices[ 1 ] = "com.sun.star.awt.UnoControlEdit";
aServices[ 2 ] = FRM_SUN_CONTROL_RICHTEXTCONTROL;
return aServices;
}
forms/source/runtime/formoperations.cxx
+1 -1
View File
@@ -152,7 +152,7 @@ namespace frm
Sequence< OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< OUString > aNames(1);
aNames[0] = OUString( "com.sun.star.form.runtime.FormOperations" );
aNames[0] = "com.sun.star.form.runtime.FormOperations";
return aNames;
}
forms/source/solar/component/navbarcontrol.cxx
+2 -2
View File
@@ -201,8 +201,8 @@ namespace frm
Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = OUString( "com.sun.star.awt.UnoControl" );
aServices[ 1 ] = OUString( "com.sun.star.form.control.NavigationToolBar" );
aServices[ 0 ] = "com.sun.star.awt.UnoControl";
aServices[ 1 ] = "com.sun.star.form.control.NavigationToolBar";
return aServices;
}
forms/source/xforms/datatypes.cxx
+2 -2
View File
@@ -286,7 +286,7 @@ namespace xforms
RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus );
if ( U_FAILURE( nMatchStatus ) )
{
_rErrorMessage = OUString( "This is no valid pattern." );
_rErrorMessage = "This is no valid pattern.";
return false;
}
}
@@ -544,7 +544,7 @@ namespace xforms
sal_Int32 nValue( 0 );
OSL_VERIFY( _rNewValue >>= nValue );
if ( nValue <= 0 )
_rErrorMessage = OUString( "Length limits must denote positive integer values." );
_rErrorMessage = "Length limits must denote positive integer values.";
// TODO/eforms: localize the error message
}
break;
formula/source/core/api/FormulaOpCodeMapperObj.cxx
+1 -1
View File
@@ -98,7 +98,7 @@ uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNa
uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSeq( 1 );
aSeq[0] = OUString( "com.sun.star.sheet.FormulaOpCodeMapper" );
aSeq[0] = "com.sun.star.sheet.FormulaOpCodeMapper";
return aSeq;
}
fpicker/source/office/OfficeFilePicker.cxx
+2 -2
View File
@@ -606,7 +606,7 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException
Sequence< OUString > aPath( nTotal );
if ( nCount == 1 )
aPath[0] = OUString(aPathList[0]);
aPath[0] = aPathList[0];
else if ( nCount > 1 )
{
INetURLObject aObj(aPathList[0]);
@@ -1132,7 +1132,7 @@ Sequence< OUString > SvtFilePicker::impl_getStaticSupportedServiceNames()
{
Sequence< OUString > seqServiceNames( 1 );
OUString* pArray = seqServiceNames.getArray();
pArray[0] = OUString( "com.sun.star.ui.dialogs.OfficeFilePicker" );
pArray[0] = "com.sun.star.ui.dialogs.OfficeFilePicker";
return seqServiceNames ;
}
fpicker/source/office/OfficeFolderPicker.cxx
+1 -1
View File
@@ -175,7 +175,7 @@ Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() throw(
Sequence< OUString > SvtFolderPicker::impl_getStaticSupportedServiceNames()
{
Sequence< OUString > seqServiceNames(1);
seqServiceNames[0] = OUString( "com.sun.star.ui.dialogs.OfficeFolderPicker" );
seqServiceNames[0] = "com.sun.star.ui.dialogs.OfficeFolderPicker";
return seqServiceNames ;
}
fpicker/source/office/fpsmartcontent.cxx
+1 -1
View File
@@ -326,7 +326,7 @@ namespace svt
ucbhelper::Content aCreated;
Sequence< OUString > aNames( 1 );
OUString* pNames = aNames.getArray();
pNames[0] = OUString( "Title" );
pNames[0] = "Title";
Sequence< Any > aValues( 1 );
Any* pValues = aValues.getArray();
pValues[0] = makeAny( _rTitle );
fpicker/source/office/iodlg.cxx
+3 -3
View File
@@ -2025,8 +2025,8 @@ short SvtFileDialog::PrepareExecute()
Reference< XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
Sequence< OUString > aProps(2);
aProps[0] = OUString( "IsVolume" );
aProps[1] = OUString( "IsRemoveable" );
aProps[0] = "IsVolume";
aProps[1] = "IsRemoveable";
Reference< XResultSet > xResultSet
= aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_FOLDERS_ONLY );
@@ -2117,7 +2117,7 @@ short SvtFileDialog::PrepareExecute()
nPos = nFilterCount;
while ( nPos-- )
{
if ( aAll != OUString( GetFilterName( nPos ) ) )
if ( aAll != GetFilterName( nPos ) )
break;
}
}
fpicker/source/office/iodlgimp.cxx
+1 -1
View File
@@ -323,7 +323,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl*
{
OUString sName = _pFilterDesc->GetName();
if ( _pFilterDesc->isGroupSeparator() )
sName = OUString( "------------------------------------------" );
sName = "------------------------------------------";
else
sName = _pFilterDesc->GetName();
framework/source/classes/menumanager.cxx
+9 -15
View File
@@ -162,9 +162,7 @@ MenuManager::MenuManager(
pPopupMenu->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu );
// Set item command for popup menu to enable it for GetImageFromURL
const static OUString aSlotString( "slot:" );
aItemCommand = aSlotString;
aItemCommand += OUString::number( ITEMID_ADDONLIST );
aItemCommand = "slot:" + OUString::number( ITEMID_ADDONLIST );
pPopupMenu->SetItemCommand( ITEMID_ADDONLIST, aItemCommand );
AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False);
@@ -559,7 +557,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
if ( i <= 9 )
{
if ( i == 9 )
aMenuShortCut = OUString( "1~0: " );
aMenuShortCut = "1~0: ";
else
{
menuShortCut[1] = (char)( '1' + i );
@@ -688,11 +686,11 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList,
Any a;
aArgsList.realloc( NUM_OF_PICKLIST_ARGS );
aArgsList[0].Name = OUString( "FileName" );
aArgsList[0].Name = "FileName";
a <<= pMenuItemHandler->aMenuItemURL;
aArgsList[0].Value = a;
aArgsList[1].Name = OUString( "Referer" );
aArgsList[1].Name = "Referer";
a <<= OUString( "private:user" );
aArgsList[1].Value = a;
@@ -706,7 +704,7 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList,
if ( nPos < ( aFilter.getLength() - 1 ) )
aFilterOptions = aFilter.copy( nPos+1 );
aArgsList[2].Name = OUString( "FilterOptions" );
aArgsList[2].Name = "FilterOptions";
a <<= aFilterOptions;
aArgsList[2].Value = a;
@@ -714,7 +712,7 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList,
aArgsList.realloc( ++NUM_OF_PICKLIST_ARGS );
}
aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = OUString( "FilterName" );
aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = "FilterName";
a <<= aFilter;
aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = a;
}
@@ -792,9 +790,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId );
if ( aItemCommand.isEmpty() )
{
const static OUString aSlotString( "slot:" );
aItemCommand = aSlotString;
aItemCommand += OUString::number( pMenuItemHandler->nItemId );
aItemCommand = "slot:" + OUString::number( pMenuItemHandler->nItemId );
pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand );
}
@@ -893,7 +889,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
{
// bookmark menu item selected
aArgs.realloc( 1 );
aArgs[0].Name = OUString( "Referer" );
aArgs[0].Name = "Referer";
aArgs[0].Value <<= OUString( "private:user" );
}
@@ -942,9 +938,7 @@ sal_uInt16 MenuManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sa
_rItemCommand = _pMenu->GetItemCommand( nItemId );
if ( _rItemCommand.isEmpty() )
{
const static OUString aSlotString( "slot:" );
_rItemCommand = aSlotString;
_rItemCommand += OUString::number( nItemId );
_rItemCommand = "slot:" + OUString::number( nItemId );
_pMenu->SetItemCommand( nItemId, _rItemCommand );
}
return nItemId;
framework/source/fwe/classes/addonsoptions.cxx
+28 -28
View File
@@ -467,7 +467,7 @@ AddonsOptions_Impl::AddonsOptions_Impl()
// Enable notification mechanism of ouer baseclass.
// We need it to get information about changes outside these class on ouer used configuration keys!
Sequence< OUString > aNotifySeq( 1 );
aNotifySeq[0] = OUString( "AddonUI" );
aNotifySeq[0] = "AddonUI";
EnableNotification( aNotifySeq );
}
@@ -1056,7 +1056,7 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstr
// extend the node names to have full path strings
for ( sal_uInt32 i = 0; i < (sal_uInt32)aSubMenuNodeNames.getLength(); i++ )
aSubMenuNodeNames[i] = OUString( aMergeMenuBaseNode + aSubMenuNodeNames[i] );
aSubMenuNodeNames[i] = aMergeMenuBaseNode + aSubMenuNodeNames[i];
return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu );
}
@@ -1321,7 +1321,7 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequen
Sequence< Sequence< PropertyValue > > aSubMenuSeq;
OUString aSubMenuRootNodeName( aRootSubMenuName + m_aPathDelimiter );
for ( sal_uInt32 n = 0; n < (sal_uInt32)aRootSubMenuNodeNames.getLength(); n++ )
aRootSubMenuNodeNames[n] = OUString( aSubMenuRootNodeName + aRootSubMenuNodeNames[n] );
aRootSubMenuNodeNames[n] = aSubMenuRootNodeName + aRootSubMenuNodeNames[n];
ReadSubMenuEntries( aRootSubMenuNodeNames, aSubMenuSeq );
aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= aSubMenuSeq;
bResult = sal_True;
@@ -1389,7 +1389,7 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName,
Sequence< Sequence< PropertyValue > > aSubMenuSeq;
OUString aSubMenuRootNodeName( aRootSubMenuName + m_aPathDelimiter );
for ( sal_uInt32 n = 0; n < (sal_uInt32)aRootSubMenuNodeNames.getLength(); n++ )
aRootSubMenuNodeNames[n] = OUString( aSubMenuRootNodeName + aRootSubMenuNodeNames[n] );
aRootSubMenuNodeNames[n] = aSubMenuRootNodeName + aRootSubMenuNodeNames[n];
ReadSubMenuEntries( aRootSubMenuNodeNames, aSubMenuSeq );
aPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value <<= aSubMenuSeq;
bResult = sal_True;
@@ -1677,12 +1677,12 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin
Sequence< OUString > lResult( PROPERTYCOUNT_MENUITEM );
// Create property names dependent from the root node name
lResult[OFFSET_MENUITEM_URL] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] );
lResult[OFFSET_MENUITEM_TITLE] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ] );
lResult[OFFSET_MENUITEM_TARGET] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] );
lResult[OFFSET_MENUITEM_CONTEXT] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
lResult[OFFSET_MENUITEM_SUBMENU] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] );
lResult[OFFSET_MENUITEM_URL] = aPropertyRootNode + m_aPropNames[ INDEX_URL ] ;
lResult[OFFSET_MENUITEM_TITLE] = aPropertyRootNode + m_aPropNames[ INDEX_TITLE ];
lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ];
lResult[OFFSET_MENUITEM_TARGET] = aPropertyRootNode + m_aPropNames[ INDEX_TARGET ];
lResult[OFFSET_MENUITEM_CONTEXT] = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ];
lResult[OFFSET_MENUITEM_SUBMENU] = aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ];
return lResult;
}
@@ -1696,9 +1696,9 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUStri
Sequence< OUString > lResult( PROPERTYCOUNT_POPUPMENU-1 );
// Create property names dependent from the root node name
lResult[OFFSET_POPUPMENU_TITLE] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
lResult[OFFSET_POPUPMENU_CONTEXT] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
lResult[OFFSET_POPUPMENU_SUBMENU] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] );
lResult[OFFSET_POPUPMENU_TITLE] = aPropertyRootNode + m_aPropNames[ INDEX_TITLE ];
lResult[OFFSET_POPUPMENU_CONTEXT] = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ];
lResult[OFFSET_POPUPMENU_SUBMENU] = aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ];
return lResult;
}
@@ -1711,13 +1711,13 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUSt
Sequence< OUString > lResult( PROPERTYCOUNT_TOOLBARITEM );
// Create property names dependent from the root node name
lResult[0] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] );
lResult[1] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
lResult[2] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER] );
lResult[3] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] );
lResult[4] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
lResult[5] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ] );
lResult[6] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] );
lResult[0] = aPropertyRootNode + m_aPropNames[ INDEX_URL ];
lResult[1] = aPropertyRootNode + m_aPropNames[ INDEX_TITLE ];
lResult[2] = aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER];
lResult[3] = aPropertyRootNode + m_aPropNames[ INDEX_TARGET ];
lResult[4] = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ];
lResult[5] = aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ];
lResult[6] = aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ];
return lResult;
}
@@ -1746,14 +1746,14 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString&
Sequence< OUString > lResult( PROPERTYCOUNT_IMAGES );
// Create property names dependent from the root node name
lResult[0] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] );
lResult[1] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] );
lResult[2] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] );
lResult[3] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] );
lResult[4] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] );
lResult[5] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] );
lResult[6] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL] );
lResult[7] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] );
lResult[0] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ];
lResult[1] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ];
lResult[2] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ];
lResult[3] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ];
lResult[4] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ];
lResult[5] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ];
lResult[6] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL];
lResult[7] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ];
return lResult;
}
framework/source/fwe/helper/actiontriggerhelper.cxx
+1 -2
View File
@@ -266,8 +266,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
if ( aCommandURL.isEmpty() )
{
aCommandURL = OUString( "slot:" );
aCommandURL += OUString::number( nItemId );
aCommandURL = "slot:" + OUString::number( nItemId );
}
a <<= aCommandURL;
framework/source/layoutmanager/layoutmanager.cxx
+2 -2
View File
@@ -711,9 +711,9 @@ Reference< XUIElement > LayoutManager::implts_createElement( const OUString& aNa
ReadGuard aReadLock( m_aLock );
Sequence< PropertyValue > aPropSeq( 2 );
aPropSeq[0].Name = OUString( "Frame" );
aPropSeq[0].Name = "Frame";
aPropSeq[0].Value <<= m_xFrame;
aPropSeq[1].Name = OUString( "Persistent" );
aPropSeq[1].Name = "Persistent";
aPropSeq[1].Value <<= sal_True;
try
framework/source/layoutmanager/toolbarlayoutmanager.cxx
+13 -13
View File
@@ -996,9 +996,9 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
OUString aElementType( "toolbar" );
uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
aPropSeq[0].Name = OUString( "Frame" );
aPropSeq[0].Name = "Frame";
aPropSeq[0].Value <<= xFrame;
aPropSeq[1].Name = OUString( "ConfigurationData" );
aPropSeq[1].Name = "ConfigurationData";
for ( sal_uInt32 i = 0; i < nCount; i++ )
{
OUString aAddonToolBarName( aAddonsToolBarStaticName + m_pAddonOptions->GetAddonsToolbarResourceName(i) );
@@ -1399,9 +1399,9 @@ uno::Reference< ui::XUIElement > ToolbarLayoutManager::implts_createElement( con
ReadGuard aReadLock( m_aLock );
uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
aPropSeq[0].Name = OUString( "Frame" );
aPropSeq[0].Name = "Frame";
aPropSeq[0].Value <<= m_xFrame;
aPropSeq[1].Name = OUString( "Persistent" );
aPropSeq[1].Name = "Persistent";
aPropSeq[1].Value <<= true;
uno::Reference< ui::XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager );
aReadLock.unlock();
@@ -1614,28 +1614,28 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
{
uno::Sequence< beans::PropertyValue > aWindowState( 9 );
aWindowState[0].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKED );
aWindowState[0].Name = WINDOWSTATE_PROPERTY_DOCKED;
aWindowState[0].Value = ::uno::makeAny( sal_Bool( !rElementData.m_bFloating ));
aWindowState[1].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_VISIBLE );
aWindowState[1].Name = WINDOWSTATE_PROPERTY_VISIBLE;
aWindowState[1].Value = uno::makeAny( sal_Bool( rElementData.m_bVisible ));
aWindowState[2].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKINGAREA );
aWindowState[2].Name = WINDOWSTATE_PROPERTY_DOCKINGAREA;
aWindowState[2].Value = uno::makeAny( static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) );
awt::Point aPos = rElementData.m_aDockedData.m_aPos;
aWindowState[3].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKPOS );
aWindowState[3].Name = WINDOWSTATE_PROPERTY_DOCKPOS;
aWindowState[3].Value <<= aPos;
aPos = rElementData.m_aFloatingData.m_aPos;
aWindowState[4].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_POS );
aWindowState[4].Name = WINDOWSTATE_PROPERTY_POS;
aWindowState[4].Value <<= aPos;
aWindowState[5].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_SIZE );
aWindowState[5].Name = WINDOWSTATE_PROPERTY_SIZE;
aWindowState[5].Value <<= rElementData.m_aFloatingData.m_aSize;
aWindowState[6].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_UINAME );
aWindowState[6].Name = WINDOWSTATE_PROPERTY_UINAME;
aWindowState[6].Value = uno::makeAny( rElementData.m_aUIName );
aWindowState[7].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_LOCKED );
aWindowState[7].Name = WINDOWSTATE_PROPERTY_LOCKED;
aWindowState[7].Value = uno::makeAny( rElementData.m_aDockedData.m_bLocked );
aWindowState[8].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_STYLE );
aWindowState[8].Name = WINDOWSTATE_PROPERTY_STYLE;
aWindowState[8].Value = uno::makeAny( rElementData.m_nStyle );
OUString aName = rElementData.m_aName;
framework/source/services/taskcreatorsrv.cxx
+2 -2
View File
@@ -209,7 +209,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai
if (bTopWindow)
{
aDescriptor.Type = css::awt::WindowClass_TOP ;
aDescriptor.WindowServiceName = OUString("window");
aDescriptor.WindowServiceName = "window";
aDescriptor.ParentIndex = -1 ;
aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >() ;
aDescriptor.Bounds = aPosSize ;
@@ -222,7 +222,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai
else
{
aDescriptor.Type = css::awt::WindowClass_TOP ;
aDescriptor.WindowServiceName = OUString("dockingwindow");
aDescriptor.WindowServiceName = "dockingwindow";
aDescriptor.ParentIndex = 1 ;
aDescriptor.Parent = xParentWindowPeer ;
aDescriptor.Bounds = aPosSize ;
framework/source/uiconfiguration/globalsettings.cxx
+2 -2
View File
@@ -241,10 +241,10 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess()
css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider =
css::configuration::theDefaultProvider::get( m_xContext );
aPropValue.Name = OUString( "nodepath" );
aPropValue.Name = "nodepath";
aPropValue.Value = css::uno::makeAny( OUString( GLOBALSETTINGS_ROOT_ACCESS ));
aArgs[0] = css::uno::makeAny( aPropValue );
aPropValue.Name = OUString( "lazywrite" );
aPropValue.Name = "lazywrite";
aPropValue.Value = css::uno::makeAny( sal_True );
aArgs[1] = css::uno::makeAny( aPropValue );
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+3 -3
View File
@@ -1316,13 +1316,13 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager()
Sequence< Any > aPropSeq( 3 );
PropertyValue aPropValue;
aPropValue.Name = OUString( "UserConfigStorage" );
aPropValue.Name = "UserConfigStorage";
aPropValue.Value = makeAny( m_xUserConfigStorage );
aPropSeq[0] = makeAny( aPropValue );
aPropValue.Name = OUString( "ModuleIdentifier" );
aPropValue.Name = "ModuleIdentifier";
aPropValue.Value = makeAny( m_aModuleIdentifier );
aPropSeq[1] = makeAny( aPropValue );
aPropValue.Name = OUString( "UserRootCommit" );
aPropValue.Name = "UserRootCommit";
aPropValue.Value = makeAny( m_xUserRootCommit );
aPropSeq[2] = makeAny( aPropValue );
framework/source/uiconfiguration/uicategorydescription.cxx
+2 -2
View File
@@ -144,7 +144,7 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString&
{
// Create configuration hierachical access name
m_aConfigCategoryAccess += aModuleName;
m_aConfigCategoryAccess += OUString( CONFIGURATION_CATEGORY_ELEMENT_ACCESS );
m_aConfigCategoryAccess += CONFIGURATION_CATEGORY_ELEMENT_ACCESS;
m_xConfigProvider = theDefaultProvider::get( rxContext );
}
@@ -341,7 +341,7 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess()
try
{
aPropValue.Name = OUString( "nodepath" );
aPropValue.Name = "nodepath";
aPropValue.Value <<= m_aConfigCategoryAccess;
aArgs[0] <<= aPropValue;
framework/source/uiconfiguration/uiconfigurationmanager.cxx
+2 -2
View File
@@ -1028,10 +1028,10 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw
Sequence< Any > aPropSeq( 2 );
PropertyValue aPropValue;
aPropValue.Name = OUString( "UserConfigStorage" );
aPropValue.Name = "UserConfigStorage";
aPropValue.Value = makeAny( m_xDocConfigStorage );
aPropSeq[0] = makeAny( aPropValue );
aPropValue.Name = OUString( "ModuleIdentifier" );
aPropValue.Name = "ModuleIdentifier";
aPropValue.Value = makeAny( m_aModuleIdentifier );
aPropSeq[1] = makeAny( aPropValue );
framework/source/uiconfiguration/windowstateconfiguration.cxx
+3 -3
View File
@@ -256,7 +256,7 @@ ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const OUString
{
// Create configuration hierachical access name
m_aConfigWindowAccess += aModuleName;
m_aConfigWindowAccess += OUString( CONFIGURATION_WINDOWSTATE_ACCESS );
m_aConfigWindowAccess += CONFIGURATION_WINDOWSTATE_ACCESS;
m_xConfigProvider = theDefaultProvider::get( rxContext );
// Initialize access array with property names.
@@ -1261,10 +1261,10 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess()
try
{
aPropValue.Name = OUString( "nodepath" );
aPropValue.Name = "nodepath";
aPropValue.Value <<= m_aConfigWindowAccess;
aArgs[0] <<= aPropValue;
aPropValue.Name = OUString( "lazywrite" );
aPropValue.Name = "lazywrite";
aPropValue.Value <<= sal_True;
aArgs[1] <<= aPropValue;
framework/source/uielement/addonstoolbarmanager.cxx
+8 -8
View File
@@ -282,19 +282,19 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
Sequence< Any > aArgs(5);
PropertyValue aPropValue;
aPropValue.Name = OUString( "ModuleIdentifier" );
aPropValue.Name = "ModuleIdentifier";
aPropValue.Value <<= m_aModuleIdentifier;
aArgs[0] <<= aPropValue;
aPropValue.Name = OUString( "Frame" );
aPropValue.Name = "Frame";
aPropValue.Value <<= m_xFrame;
aArgs[1] <<= aPropValue;
aPropValue.Name = OUString( "ServiceManager" );
aPropValue.Name = "ServiceManager";
aPropValue.Value <<= Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW);
aArgs[2] <<= aPropValue;
aPropValue.Name = OUString( "ParentWindow" );
aPropValue.Name = "ParentWindow";
aPropValue.Value <<= xToolbarWindow;
aArgs[3] <<= aPropValue;
aPropValue.Name = OUString( "ItemId" );
aPropValue.Name = "ItemId";
aPropValue.Value = makeAny( sal_Int32( nId ));
aArgs[4] <<= aPropValue;
@@ -325,13 +325,13 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
{
PropertyValue aPropValue;
Sequence< Any > aArgs( 3 );
aPropValue.Name = OUString( "Frame" );
aPropValue.Name = "Frame";
aPropValue.Value <<= m_xFrame;
aArgs[0] <<= aPropValue;
aPropValue.Name = OUString( "CommandURL" );
aPropValue.Name = "CommandURL";
aPropValue.Value <<= aURL;
aArgs[1] <<= aPropValue;
aPropValue.Name = OUString( "ServiceManager" );
aPropValue.Name = "ServiceManager";
aPropValue.Value <<= Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW);
aArgs[2] <<= aPropValue;
try
framework/source/uielement/buttontoolbarcontroller.cxx
+1 -1
View File
@@ -252,7 +252,7 @@ throw (::com::sun::star::uno::RuntimeException)
Sequence<PropertyValue> aArgs( 1 );
// Provide key modifier information to dispatch function
aArgs[0].Name = OUString( "KeyModifier" );
aArgs[0].Name = "KeyModifier";
aArgs[0].Value <<= KeyModifier;
xDispatch->dispatch( aTargetURL, aArgs );

Some files were not shown because too many files have changed in this diff Show More