[Libreoffice-commits] .: 7 commits - svtools/source unotools/source vcl/source vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Sat Oct 30 09:02:26 PDT 2010
svtools/source/config/apearcfg.cxx | 2
svtools/source/config/fontsubstconfig.cxx | 6 +-
unotools/source/config/confignode.cxx | 2
unotools/source/config/eventcfg.cxx | 10 ++--
vcl/source/app/session.cxx | 2
vcl/source/app/settings.cxx | 34 +++++++--------
vcl/unx/source/dtrans/X11_selection.cxx | 66 +++++++++++++++---------------
7 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit d5368b20175405a82ecceec4a60a90cf5476d9ac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 30 16:59:24 2010 +0100
small startup optimization
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 71120bf..ef9eb19 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -357,7 +357,7 @@ namespace utl
Reference< XServiceInfo > xSI(m_xHierarchyAccess, UNO_QUERY);
if (xSI.is())
{
- try { bIsSet = xSI->supportsService(::rtl::OUString::createFromAscii("com.sun.star.configuration.SetAccess")); }
+ try { bIsSet = xSI->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.SetAccess"))); }
catch(Exception&) { }
}
return bIsSet;
commit 456a3b00822227f7b1f34db6b1e010fbd23180ee
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 30 16:29:10 2010 +0100
small startup optimization
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index e7ae061..04fe680 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -377,39 +377,39 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c
XSynchronize( m_pDisplay, True );
#endif
// clipboard selection
- m_nCLIPBOARDAtom = getAtom( OUString::createFromAscii( "CLIPBOARD" ) );
+ m_nCLIPBOARDAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) );
// special targets
- m_nTARGETSAtom = getAtom( OUString::createFromAscii( "TARGETS" ) );
- m_nTIMESTAMPAtom = getAtom( OUString::createFromAscii( "TIMESTAMP" ) );
- m_nTEXTAtom = getAtom( OUString::createFromAscii( "TEXT" ) );
- m_nINCRAtom = getAtom( OUString::createFromAscii( "INCR" ) );
- m_nCOMPOUNDAtom = getAtom( OUString::createFromAscii( "COMPOUND_TEXT" ) );
- m_nMULTIPLEAtom = getAtom( OUString::createFromAscii( "MULTIPLE" ) );
- m_nUTF16Atom = getAtom( OUString::createFromAscii( "ISO10646-1" ) );
-// m_nUTF16Atom = getAtom( OUString::createFromAscii( "text/plain;charset=ISO-10646-UCS-2" ) );
- m_nImageBmpAtom = getAtom( OUString::createFromAscii( "image/bmp" ) );
+ m_nTARGETSAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("TARGETS")) );
+ m_nTIMESTAMPAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")) );
+ m_nTEXTAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("TEXT")) );
+ m_nINCRAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("INCR")) );
+ m_nCOMPOUNDAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("COMPOUND_TEXT")) );
+ m_nMULTIPLEAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("MULTIPLE")) );
+ m_nUTF16Atom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("ISO10646-1")) );
+// m_nUTF16Atom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=ISO-10646-UCS-2")) );
+ m_nImageBmpAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("image/bmp")) );
// Atoms for Xdnd protocol
- m_nXdndAware = getAtom( OUString::createFromAscii( "XdndAware" ) );
- m_nXdndEnter = getAtom( OUString::createFromAscii( "XdndEnter" ) );
- m_nXdndLeave = getAtom( OUString::createFromAscii( "XdndLeave" ) );
- m_nXdndPosition = getAtom( OUString::createFromAscii( "XdndPosition" ) );
- m_nXdndStatus = getAtom( OUString::createFromAscii( "XdndStatus" ) );
- m_nXdndDrop = getAtom( OUString::createFromAscii( "XdndDrop" ) );
- m_nXdndFinished = getAtom( OUString::createFromAscii( "XdndFinished" ) );
- m_nXdndSelection = getAtom( OUString::createFromAscii( "XdndSelection" ) );
- m_nXdndTypeList = getAtom( OUString::createFromAscii( "XdndTypeList" ) );
- m_nXdndProxy = getAtom( OUString::createFromAscii( "XdndProxy" ) );
- m_nXdndActionCopy = getAtom( OUString::createFromAscii( "XdndActionCopy" ) );
- m_nXdndActionMove = getAtom( OUString::createFromAscii( "XdndActionMove" ) );
- m_nXdndActionLink = getAtom( OUString::createFromAscii( "XdndActionLink" ) );
- m_nXdndActionAsk = getAtom( OUString::createFromAscii( "XdndActionAsk" ) );
- m_nXdndActionPrivate= getAtom( OUString::createFromAscii( "XdndActionPrivate" ) );
+ m_nXdndAware = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndAware")) );
+ m_nXdndEnter = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndEnter")) );
+ m_nXdndLeave = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndLeave")) );
+ m_nXdndPosition = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndPosition")) );
+ m_nXdndStatus = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndStatus")) );
+ m_nXdndDrop = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndDrop")) );
+ m_nXdndFinished = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndFinished")) );
+ m_nXdndSelection = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndSelection")) );
+ m_nXdndTypeList = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndTypeList")) );
+ m_nXdndProxy = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndProxy")) );
+ m_nXdndActionCopy = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionCopy")) );
+ m_nXdndActionMove = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionMove")) );
+ m_nXdndActionLink = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionLink")) );
+ m_nXdndActionAsk = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionAsk")) );
+ m_nXdndActionPrivate= getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionPrivate")) );
// initialize map with member none
- m_aAtomToString[ 0 ]= OUString::createFromAscii( "None" );
- m_aAtomToString[ XA_PRIMARY ] = OUString::createFromAscii( "PRIMARY" );
+ m_aAtomToString[ 0 ]= OUString(RTL_CONSTASCII_USTRINGPARAM("None"));
+ m_aAtomToString[ XA_PRIMARY ] = OUString(RTL_CONSTASCII_USTRINGPARAM("PRIMARY"));
// create a (invisible) message window
m_aWindow = XCreateSimpleWindow( m_pDisplay, DefaultRootWindow( m_pDisplay ),
@@ -677,7 +677,7 @@ bool SelectionManager::convertData(
aEncoding = getTextPlainEncoding( aFlavor.MimeType );
if( aEncoding != RTL_TEXTENCODING_DONTKNOW || bCompoundText )
{
- aFlavor.MimeType = OUString::createFromAscii( "text/plain;charset=utf-16" );
+ aFlavor.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16"));
aFlavor.DataType = getCppuType( (OUString *) 0 );
if( xTransferable->isDataFlavorSupported( aFlavor ) )
{
@@ -869,7 +869,7 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes,
rOutTypeList.push_front( XA_STRING );
rOutTypeList.push_front( m_nCOMPOUNDAtom );
}
- convertTypeToNative( OUString::createFromAscii( "text/plain;charset=utf-8" ), targetselection, nFormat, rOutTypeList, true );
+ convertTypeToNative( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-8")), targetselection, nFormat, rOutTypeList, true );
}
if( targetselection != m_nXdndSelection )
rOutTypeList.push_back( m_nMULTIPLEAtom );
@@ -1402,7 +1402,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
Sequence< DataFlavor > aTemp( nNewFlavors );
for( i = 0; i < nNewFlavors-1; i++ )
aTemp.getArray()[i+1] = rTypes.getConstArray()[i];
- aTemp.getArray()[0].MimeType = OUString::createFromAscii( "text/plain;charset=utf-16" );
+ aTemp.getArray()[0].MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16"));
aTemp.getArray()[0].DataType = getCppuType( (OUString*)0 );
rTypes = aTemp;
@@ -1523,7 +1523,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
try
{
Any aResult =
- m_xBitmapConverter->invoke( OUString::createFromAscii( "convert-bitmap-depth" ),
+ m_xBitmapConverter->invoke( OUString(RTL_CONSTASCII_USTRINGPARAM("convert-bitmap-depth")),
aArgs, aOutIndex, aOutArgs );
if( aResult >>= xBM )
aData = xBM->getDIB();
@@ -2071,7 +2071,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
// notification about success/failure of one of our conversion requests
#if OSL_DEBUG_LEVEL > 1
OUString aSelection( getString( rNotify.selection ) );
- OUString aProperty( OUString::createFromAscii( "None" ) );
+ OUString aProperty(RTL_CONSTASCII_USTRINGPARAM("None"));
if( rNotify.property )
aProperty = getString( rNotify.property );
fprintf( stderr, "handleSelectionNotify for selection %s and property %s (0x%lx)\n",
@@ -3777,7 +3777,7 @@ void SelectionManager::run( void* pThis )
Reference< XMultiServiceFactory > xFact( ::comphelper::getProcessServiceFactory() );
if( xFact.is() )
{
- Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
+ Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY );
if( xDesktop.is() )
xDesktop->addTerminateListener(This);
}
commit 32c28e39c0a1cf78f242c0eecacf5a35738f0e67
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 30 16:25:32 2010 +0100
small startup optimization
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index b1f0510..c3a36fb 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -356,7 +356,7 @@ OUString SAL_CALL vcl_session_getImplementationName()
Sequence< rtl::OUString > SAL_CALL vcl_session_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString::createFromAscii("com.sun.star.frame.SessionManagerClient");
+ aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SessionManagerClient"));
return aRet;
}
commit 4a5140dbf6fd0effaecf4967343c5cae1d969fdf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 30 16:24:31 2010 +0100
small startup optimization
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index f2d5fb7..20adcc8 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -705,35 +705,35 @@ void StyleSettings::Set3DColors( const Color& rColor )
{
switch ( nStyle )
{
- case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString::createFromAscii( "default" );
- case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString::createFromAscii( "hicontrast" );
- case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString::createFromAscii( "tango" ); // industrial is dead
- case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString::createFromAscii( "crystal" );
- case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" );
- case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString::createFromAscii( "oxygen" );
- case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString::createFromAscii( "classic" );
+ case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"));
+ case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hicontrast"));
+ case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango")); // industrial is dead
+ case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("crystal"));
+ case STYLE_SYMBOLS_TANGO: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango"));
+ case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxygen"));
+ case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("classic"));
}
- return ::rtl::OUString::createFromAscii( "auto" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("auto"));
}
// -----------------------------------------------------------------------
ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const
{
- if ( rName == ::rtl::OUString::createFromAscii( "default" ) )
+ if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")) )
return STYLE_SYMBOLS_DEFAULT;
- else if ( rName == ::rtl::OUString::createFromAscii( "hicontrast" ) )
+ else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hicontrast")) )
return STYLE_SYMBOLS_HICONTRAST;
- else if ( rName == ::rtl::OUString::createFromAscii( "industrial" ) )
+ else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("industrial")) )
return STYLE_SYMBOLS_TANGO; // industrial is dead
- else if ( rName == ::rtl::OUString::createFromAscii( "crystal" ) )
+ else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("crystal")) )
return STYLE_SYMBOLS_CRYSTAL;
- else if ( rName == ::rtl::OUString::createFromAscii( "tango" ) )
+ else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango")) )
return STYLE_SYMBOLS_TANGO;
- else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
+ else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxygen")) )
return STYLE_SYMBOLS_OXYGEN;
- else if ( rName == ::rtl::OUString::createFromAscii( "classic" ) )
+ else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("classic")) )
return STYLE_SYMBOLS_CLASSIC;
return STYLE_SYMBOLS_AUTO;
@@ -1947,11 +1947,11 @@ BOOL AllSettings::GetLayoutRTL() const
nUIMirroring = 0; // ask configuration only once
utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
vcl::unohelper::GetMultiServiceFactory(),
- OUString::createFromAscii( "org.openoffice.Office.Common/I18N/CTL" ) ); // note: case sensisitive !
+ OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/I18N/CTL")) ); // note: case sensisitive !
if ( aNode.isValid() )
{
BOOL bTmp = BOOL();
- ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString::createFromAscii( "UIMirroring" ) );
+ ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("UIMirroring")) );
if( aValue >>= bTmp )
{
// found true or false; if it was nil, nothing is changed
commit 14ee0af8a8e125f399843a6d3048ef4c5d7538c1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 30 16:21:42 2010 +0100
small startup optimization
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 8caa9cd..b30c676 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -53,7 +53,7 @@ sal_Bool SvtTabAppearanceCfg::bInitialized = sal_False;
Beschreibung:
--------------------------------------------------------------------*/
SvtTabAppearanceCfg::SvtTabAppearanceCfg()
- :ConfigItem(OUString::createFromAscii("Office.Common/View"))
+ :ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View")))
,nLookNFeel ( DEFAULT_LOOKNFEEL )
,nDragMode ( DEFAULT_DRAGMODE )
,nScaleFactor ( DEFAULT_SCALEFACTOR )
commit 66d1860365bee20a73328712873a6515bf7e346f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 30 16:21:16 2010 +0100
small startup optimization
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index deff93b..53a8ae2 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -68,7 +68,7 @@ struct SvtFontSubstConfig_Impl
---------------------------------------------------------------------------*/
SvtFontSubstConfig::SvtFontSubstConfig() :
- ConfigItem(C2U("Office.Common/Font/Substitution")),
+ ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font/Substitution"))),
bIsEnabled(sal_False),
pImpl(new SvtFontSubstConfig_Impl)
{
@@ -87,13 +87,13 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
Sequence<OUString> aPropNames(aNodeNames.getLength() * 4);
OUString* pNames = aPropNames.getArray();
sal_Int32 nName = 0;
- sPropPrefix += C2U("/");
+ sPropPrefix += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
sal_Int32 nNode;
for(nNode = 0; nNode < aNodeNames.getLength(); nNode++)
{
OUString sStart(sPropPrefix);
sStart += pNodeNames[nNode];
- sStart += C2U("/");
+ sStart += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
pNames[nName] = sStart; pNames[nName++] += C2U(cReplaceFont);
pNames[nName] = sStart; pNames[nName++] += C2U(cSubstituteFont);
pNames[nName] = sStart; pNames[nName++] += C2U(cAlways);
commit 113c93077c6ab3effb74d972cf603eabfed6b39f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 30 16:14:25 2010 +0100
small startup optimization
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 8e6e079..d81e576 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -187,8 +187,8 @@ void GlobalEventConfig_Impl::Commit()
ClearNodeSet( SETNODE_BINDINGS );
Sequence< beans::PropertyValue > seqValues( 1 );
OUString sNode;
- static const OUString sPrefix(SETNODE_BINDINGS + PATHDELIMITER + OUString::createFromAscii("BindingType['"));
- static const OUString sPostfix(OUString::createFromAscii("']") + PATHDELIMITER + PROPERTYNAME_BINDINGURL);
+ static const OUString sPrefix(SETNODE_BINDINGS + PATHDELIMITER + OUString(RTL_CONSTASCII_USTRINGPARAM("BindingType['")));
+ static const OUString sPostfix(OUString(RTL_CONSTASCII_USTRINGPARAM("']")) + PATHDELIMITER + PROPERTYNAME_BINDINGURL);
//step through the list of events
for(int i=0;it!=it_end;++it,++i)
{
@@ -290,9 +290,9 @@ Any SAL_CALL GlobalEventConfig_Impl::getByName( const OUString& aName ) throw (c
{
Any aRet;
Sequence< beans::PropertyValue > props(2);
- props[0].Name = OUString::createFromAscii("EventType");
- props[0].Value <<= OUString::createFromAscii("Script");
- props[1].Name = OUString::createFromAscii("Script");
+ props[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("EventType"));
+ props[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("Script"));
+ props[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Script"));
EventBindingHash::const_iterator it = m_eventBindingHash.find( aName );
if( it != m_eventBindingHash.end() )
{
More information about the Libreoffice-commits
mailing list