Skip to content

C
core
Kaydet (Commit) d3d6b5d0 authored tarafından pjacquod's avatar pjacquod Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

RTL_CONSTASCII_USTRINGPARAM in components cui options 

this time options should be cleared
üst fd16ff06
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
cui/source/options/cfgchart.cxx
Dosyayı görüntüle @ d3d6b5d0
...@@ -171,11 +171,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const ...@@ -171,11 +171,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const
// ==================== // ====================
SvxChartOptions::SvxChartOptions() : SvxChartOptions::SvxChartOptions() :
::utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Chart" )), ::utl::ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Chart") ) ),
mbIsInitialized( FALSE ) mbIsInitialized( FALSE )
{ {
maPropertyNames.realloc( 1 ); maPropertyNames.realloc( 1 );
maPropertyNames[ 0 ] = ::rtl::OUString::createFromAscii( "DefaultColor/Series" ); maPropertyNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultColor/Series") );
} }
SvxChartOptions::~SvxChartOptions() SvxChartOptions::~SvxChartOptions()
......
cui/source/options/optgdlg.cxx
Dosyayı görüntüle @ d3d6b5d0
...@@ -136,7 +136,7 @@ namespace ...@@ -136,7 +136,7 @@ namespace
if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ) if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
{ {
#ifdef ENABLE_GTK #ifdef ENABLE_GTK
return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.GtkFilePicker" ); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.GtkFilePicker") );
#else #else
return rtl::OUString(); return rtl::OUString();
#endif #endif
...@@ -144,7 +144,7 @@ namespace ...@@ -144,7 +144,7 @@ namespace
else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) ) else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
{ {
#ifdef ENABLE_KDE4 #ifdef ENABLE_KDE4
return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.KDE4FilePicker" ); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker") );
#else #else
return rtl::OUString(); return rtl::OUString();
#endif #endif
...@@ -152,15 +152,15 @@ namespace ...@@ -152,15 +152,15 @@ namespace
else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) ) else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
{ {
#ifdef ENABLE_KDE #ifdef ENABLE_KDE
return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.KDEFilePicker" ); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker") );
#else #else
return rtl::OUString(); return rtl::OUString();
#endif #endif
} }
#if defined WNT #if defined WNT
return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" ); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker") );
#elif (defined MACOSX && defined QUARTZ) #elif (defined MACOSX && defined QUARTZ)
return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.AquaFilePicker" ); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AquaFilePicker") );
#else #else
return rtl::OUString(); return rtl::OUString();
#endif #endif
...@@ -843,14 +843,14 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : ...@@ -843,14 +843,14 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
{ {
::rtl::OUString aAutoStr( aIconStyleLB.GetEntry( 0 ) ); ::rtl::OUString aAutoStr( aIconStyleLB.GetEntry( 0 ) );
aAutoStr += ::rtl::OUString::createFromAscii( " (" ); aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (") );
ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle(); ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
if ( aIconStyleItemId[nAutoStyle] ) if ( aIconStyleItemId[nAutoStyle] )
aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] ); aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] );
aIconStyleLB.RemoveEntry( 0 ); aIconStyleLB.RemoveEntry( 0 );
aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString::createFromAscii( ")" ), 0 ); aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 );
// separate auto and other icon themes // separate auto and other icon themes
aIconStyleLB.SetSeparatorPos( 0 ); aIconStyleLB.SetSeparatorPos( 0 );
} }
......
cui/source/options/optimprove.cxx
Dosyayı görüntüle @ d3d6b5d0
...@@ -173,22 +173,22 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG ) ...@@ -173,22 +173,22 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG )
{ {
uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
uno::Reference< com::sun::star::oooimprovement::XCoreController > core_c( uno::Reference< com::sun::star::oooimprovement::XCoreController > core_c(
xSMGR->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.oooimprovement.CoreController")), xSMGR->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController") ) ),
uno::UNO_QUERY); uno::UNO_QUERY);
if(core_c.is()) if(core_c.is())
{ {
::comphelper::ConfigurationHelper::writeDirectKey( ::comphelper::ConfigurationHelper::writeDirectKey(
xSMGR, xSMGR,
::rtl::OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings") ),
::rtl::OUString::createFromAscii("Participation"), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Participation") ),
::rtl::OUString::createFromAscii("ShowedInvitation"), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation") ),
uno::makeAny( true ), uno::makeAny( true ),
::comphelper::ConfigurationHelper::E_STANDARD ); ::comphelper::ConfigurationHelper::E_STANDARD );
::comphelper::ConfigurationHelper::writeDirectKey( ::comphelper::ConfigurationHelper::writeDirectKey(
xSMGR, xSMGR,
::rtl::OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings") ),
::rtl::OUString::createFromAscii("Participation"), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Participation") ),
::rtl::OUString::createFromAscii("InvitationAccepted"), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted") ),
uno::makeAny( m_pPage->IsYesChecked() ), uno::makeAny( m_pPage->IsYesChecked() ),
::comphelper::ConfigurationHelper::E_STANDARD ); ::comphelper::ConfigurationHelper::E_STANDARD );
// TODO: refactor // TODO: refactor
......
cui/source/options/optimprove2.cxx
Dosyayı görüntüle @ d3d6b5d0
...@@ -144,11 +144,11 @@ IMPL_LINK( SvxImprovementOptionsPage, HandleShowData, PushButton*, EMPTYARG ) ...@@ -144,11 +144,11 @@ IMPL_LINK( SvxImprovementOptionsPage, HandleShowData, PushButton*, EMPTYARG )
::rtl::OUString sLogFile( m_sLogPath ); ::rtl::OUString sLogFile( m_sLogPath );
sLogFile += C2S("/Current.csv"); sLogFile += C2S("/Current.csv");
uno::Sequence< beans::PropertyValue > aArgs(3); uno::Sequence< beans::PropertyValue > aArgs(3);
aArgs[0].Name = ::rtl::OUString::createFromAscii("FilterName"); aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName") );
aArgs[0].Value = uno::makeAny(::rtl::OUString::createFromAscii("Text - txt - csv (StarCalc)")); aArgs[0].Value = uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ) );
aArgs[1].Name = ::rtl::OUString::createFromAscii("FilterOptions"); aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterOptions") );
aArgs[1].Value = uno::makeAny(::rtl::OUString::createFromAscii("44,34,12,1,")); aArgs[1].Value = uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("44,34,12,1,") ) );
aArgs[2].Name = ::rtl::OUString::createFromAscii("ReadOnly"); aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
aArgs[2].Value = uno::makeAny(true); aArgs[2].Value = uno::makeAny(true);
uno::Reference< lang::XComponent > xDoc = ::comphelper::SynchronousDispatch::dispatch( uno::Reference< lang::XComponent > xDoc = ::comphelper::SynchronousDispatch::dispatch(
......
cui/source/options/optjava.cxx
Dosyayı görüntüle @ d3d6b5d0
...@@ -304,7 +304,7 @@ IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG ) ...@@ -304,7 +304,7 @@ IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG )
{ {
Reference < XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); Reference < XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
xFolderPicker = Reference< XFolderPicker >( xFolderPicker = Reference< XFolderPicker >(
xMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FolderPicker" ) ), UNO_QUERY ); xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FolderPicker") ) ), UNO_QUERY );
String sWorkFolder = SvtPathOptions().GetWorkPath(); String sWorkFolder = SvtPathOptions().GetWorkPath();
xFolderPicker->setDisplayDirectory( sWorkFolder ); xFolderPicker->setDisplayDirectory( sWorkFolder );
......
cui/source/options/sdbcdriverenum.cxx
Dosyayı görüntüle @ d3d6b5d0
...@@ -64,7 +64,7 @@ namespace offapp ...@@ -64,7 +64,7 @@ namespace offapp
try try
{ {
Reference< XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory(); Reference< XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory();
Reference< XInterface > xDM = xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdbc.DriverManager")); Reference< XInterface > xDM = xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager") ) );
OSL_ENSURE(xDM.is(), "ODriverEnumerationImpl::ODriverEnumerationImpl: no access to the SDBC driver manager!"); OSL_ENSURE(xDM.is(), "ODriverEnumerationImpl::ODriverEnumerationImpl: no access to the SDBC driver manager!");
Reference< XEnumerationAccess > xEnumAccess(xDM, UNO_QUERY); Reference< XEnumerationAccess > xEnumAccess(xDM, UNO_QUERY);
......
cui/source/options/treeopt.cxx
Dosyayı görüntüle @ d3d6b5d0
...@@ -1427,26 +1427,26 @@ BOOL EnableSSO( void ) ...@@ -1427,26 +1427,26 @@ BOOL EnableSSO( void )
::rtl::Bootstrap theBootstrap( theIniFile ); ::rtl::Bootstrap theBootstrap( theIniFile );
rtl::OUString theOfflineValue; rtl::OUString theOfflineValue;
rtl::OUString theDefaultOfflineValue = rtl::OUString::createFromAscii( "false" ); rtl::OUString theDefaultOfflineValue (RTL_CONSTASCII_USTRINGPARAM("false") );
theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_Offline" ), theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_Offline") ),
theOfflineValue, theOfflineValue,
theDefaultOfflineValue ); theDefaultOfflineValue );
rtl::OUString theServerTypeValue; rtl::OUString theServerTypeValue;
theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_ServerType" ), theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_ServerType") ),
theServerTypeValue ); theServerTypeValue );
rtl::OUString theBackendServiceTypeValue; rtl::OUString theBackendServiceTypeValue;
theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_BackendService" ), theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_BackendService") ),
theBackendServiceTypeValue ); theBackendServiceTypeValue );
BOOL bSSOEnabled = BOOL bSSOEnabled =
( theOfflineValue == theDefaultOfflineValue && ( theOfflineValue == theDefaultOfflineValue &&
( theServerTypeValue.getLength() == 0 || ( theServerTypeValue.getLength() == 0 ||
theServerTypeValue == rtl::OUString::createFromAscii( "uno" ) ) && theServerTypeValue == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno") ) ) &&
theBackendServiceTypeValue == theBackendServiceTypeValue ==
rtl::OUString::createFromAscii( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.configuration.backend.LdapSingleBackend" ) ); "com.sun.star.comp.configuration.backend.LdapSingleBackend") ) );
if ( bSSOEnabled && GetSSOCreator() == 0 ) if ( bSSOEnabled && GetSSOCreator() == 0 )
{ {
bSSOEnabled = FALSE; bSSOEnabled = FALSE;
...@@ -1466,7 +1466,7 @@ CreateTabPage GetSSOCreator( void ) ...@@ -1466,7 +1466,7 @@ CreateTabPage GetSSOCreator( void )
if( aModule.loadRelative( if( aModule.loadRelative(
&thisModule, theModuleName, SAL_LOADMODULE_DEFAULT ) ) &thisModule, theModuleName, SAL_LOADMODULE_DEFAULT ) )
{ {
rtl::OUString theSymbolName( rtl::OUString::createFromAscii( "CreateSSOTabPage" ) ); rtl::OUString theSymbolName( RTL_CONSTASCII_USTRINGPARAM("CreateSSOTabPage" ) );
theSymbol = reinterpret_cast<CreateTabPage>(aModule.getFunctionSymbol( theSymbolName )); theSymbol = reinterpret_cast<CreateTabPage>(aModule.getFunctionSymbol( theSymbolName ));
} }
} }
...@@ -1713,8 +1713,8 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) ...@@ -1713,8 +1713,8 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
} }
Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
Reference< XPropertySet > xProp( Reference< XPropertySet > xProp(
xMgr->createInstance( ::rtl::OUString::createFromAscii( xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.linguistic2.LinguProperties") ), "com.sun.star.linguistic2.LinguProperties") ) ),
UNO_QUERY ); UNO_QUERY );
if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, sal_False, &pItem ) ) if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, sal_False, &pItem ) )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment