[Libreoffice-commits] .: cppuhelper/inc cui/source
Michael Meeks
michael at kemper.freedesktop.org
Mon Jul 16 02:23:46 PDT 2012
cppuhelper/inc/cppuhelper/interfacecontainer.h | 2
cui/source/inc/cuires.hrc | 1
cui/source/options/treeopt.cxx | 70 -------------------------
cui/source/options/treeopt.src | 1
4 files changed, 2 insertions(+), 72 deletions(-)
New commits:
commit 098be920e012a3ae133d23cffdb161a0816d29c4
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon Jul 16 10:20:11 2012 +0100
remove obsolete hooks for proprietary Sun single-sign-on config page
Change-Id: Ia6c0fbd33a4293ba863b4179f03f78ded413040a
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h
index 251297d..d745f08 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.h
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h
@@ -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;
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 8449f5f..c7343ad 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -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)
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 533e8fe..9db1841 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -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,10 +1563,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
continue;
}
}
- if ( nPageId != RID_SVXPAGE_SSO || isSSOEnabled )
- {
- AddTabPage( nPageId, sNewTitle, nGroup );
- }
+ AddTabPage( nPageId, sNewTitle, nGroup );
}
}
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index f05f978..6a1644c 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -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 ; > ;
};
};
More information about the Libreoffice-commits
mailing list