mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove obsolete hooks for proprietary Sun single-sign-on config page

Browse Source 
Change-Id: Ia6c0fbd33a4293ba863b4179f03f78ded413040a
This commit is contained in:
Michael Meeks
2012-07-16 10:20:11 +01:00
parent 4ad006fc76
commit 098be920e0
4 changed files with 2 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cppuhelper/inc/cppuhelper/interfacecontainer.h
View File

@@ -441,7 +441,7 @@ struct OBroadcastHelperVar
{
/** The shared mutex. */
::osl::Mutex & rMutex;
/** ListenerContainer class is thread save. */
/** ListenerContainer class is thread safe. */
container aLC;
/** Dispose call ready. */
sal_Bool bDisposed;

1
cui/source/inc/cuires.hrc
View File

@@ -125,7 +125,6 @@
// treeopt
#define RID_SVXPAGE_COLOR (RID_SVX_START + 60)
#define RID_SVXPAGE_SSO (RID_SVX_START + 251)
#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 )
#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
#define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115)

68
cui/source/options/treeopt.cxx
View File

@@ -325,7 +325,6 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem
case SID_SB_CONNECTIONPOOLING: fnCreate = &::offapp::ConnectionPoolOptionsPage::Create; break;
case SID_SB_DBREGISTEROPTIONS: fnCreate = &::svx::DbRegistrationOptionsPage::Create; break;
case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break;
case RID_SVXPAGE_SSO: fnCreate = GetSSOCreator(); break;
case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break;
case RID_SVXPAGE_INET_MOZPLUGIN: fnCreate = &MozPluginTabPage::Create; break;
case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break;
@@ -360,7 +359,6 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "ProductName", "Appearance", RID_SVXPAGE_COLORCONFIG },
{ "ProductName", "Accessibility", RID_SVXPAGE_ACCESSIBILITYCONFIG },
{ "ProductName", "Java", RID_SVXPAGE_OPTIONS_JAVA },
{ "ProductName", "NetworkIdentity", RID_SVXPAGE_SSO },
{ "ProductName", "OnlineUpdate", RID_SVXPAGE_ONLINEUPDATE },
{ "LanguageSettings", NULL, SID_LANGUAGE_OPTIONS },
{ "LanguageSettings", "Languages", OFA_TP_LANGUAGES },
@@ -1179,68 +1177,6 @@ OfaPageResource::OfaPageResource() :
FreeResource();
}
sal_Bool EnableSSO( void )
{
// SSO must be enabled if the configuration manager bootstrap settings
// are configured as follows ...
// CFG_Offline=false
// CFG_ServerType=uno ( or unspecified )
// CFG_BackendService=
// com.sun.star.comp.configuration.backend.LdapSingleBackend
rtl::OUString theIniFile;
osl_getExecutableFile( &theIniFile.pData );
theIniFile = theIniFile.copy( 0, theIniFile.lastIndexOf( '/' ) + 1 ) +
rtl::OUString(SAL_CONFIGFILE( "configmgr" ) );
::rtl::Bootstrap theBootstrap( theIniFile );
rtl::OUString theOfflineValue;
rtl::OUString theDefaultOfflineValue ("false" );
theBootstrap.getFrom( rtl::OUString("CFG_Offline" ),
theOfflineValue,
theDefaultOfflineValue );
rtl::OUString theServerTypeValue;
theBootstrap.getFrom( rtl::OUString("CFG_ServerType" ),
theServerTypeValue );
rtl::OUString theBackendServiceTypeValue;
theBootstrap.getFrom( rtl::OUString("CFG_BackendService" ),
theBackendServiceTypeValue );
sal_Bool bSSOEnabled =
( theOfflineValue == theDefaultOfflineValue &&
( theServerTypeValue.isEmpty() ||
theServerTypeValue == rtl::OUString("uno" ) ) &&
theBackendServiceTypeValue ==
rtl::OUString( "com.sun.star.comp.configuration.backend.LdapSingleBackend" ) );
if ( bSSOEnabled && GetSSOCreator() == 0 )
{
bSSOEnabled = sal_False;
}
return bSSOEnabled;
}
extern "C" { static void SAL_CALL thisModule() {} }
CreateTabPage GetSSOCreator( void )
{
static CreateTabPage theSymbol = 0;
if ( theSymbol == 0 )
{
osl::Module aModule;
rtl::OUString theModuleName( SVLIBRARY( "ssoopt" ) );
if( aModule.loadRelative(
&thisModule, theModuleName, SAL_LOADMODULE_DEFAULT ) )
{
rtl::OUString theSymbolName( "CreateSSOTabPage" );
theSymbol = reinterpret_cast<CreateTabPage>(aModule.getFunctionSymbol( theSymbolName ));
}
}
return theSymbol;
}
SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
{
Reference< XPropertySet > xProp( SvxGetLinguPropertySet() );
@@ -1594,7 +1530,6 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
sal_uInt16 i, nPageId;
// %PRODUCTNAME options
sal_Bool isSSOEnabled = EnableSSO();
if ( !lcl_isOptionHidden( SID_GENERAL_OPTIONS, aOptionsDlgOpt ) )
{
ResStringArray& rGeneralArray = aDlgResource.GetGeneralArray();
@@ -1628,12 +1563,9 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
continue;
}
}
if ( nPageId != RID_SVXPAGE_SSO || isSSOEnabled )
{
AddTabPage( nPageId, sNewTitle, nGroup );
}
}
}
// Load and Save options
if ( !lcl_isOptionHidden( SID_FILTER_DLG, aOptionsDlgOpt ) )

1
cui/source/options/treeopt.src
View File

@@ -107,7 +107,6 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
< "Appearance" ; RID_SVXPAGE_COLORCONFIG ; > ;
< "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
< "Java" ; RID_SVXPAGE_OPTIONS_JAVA ; > ;
< "Network Identity" ; RID_SVXPAGE_SSO ; > ;
< "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ;
};
};