From 2715c65c510713f1a6c9ae83298e0cfb885f5475 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:25:07 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- libreoffice/3.3.3/patches/libreoffice-trinity.diff | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'libreoffice/3.3.3/patches/libreoffice-trinity.diff') diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff index 1e1fae0..f5ee02d 100644 --- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff @@ -2986,8 +2986,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ return false; ++ ++ lcl_getFunctionFromModuleOrUnload( m_hConnectorModule, "createKabConnection", m_pConnectionFactoryFunc ); -++ lcl_getFunctionFromModuleOrUnload( m_hConnectorModule, "initKApplication", m_pApplicationInitFunc ); -++ lcl_getFunctionFromModuleOrUnload( m_hConnectorModule, "shutdownKApplication", m_pApplicationShutdownFunc ); +++ lcl_getFunctionFromModuleOrUnload( m_hConnectorModule, "initTDEApplication", m_pApplicationInitFunc ); +++ lcl_getFunctionFromModuleOrUnload( m_hConnectorModule, "shutdownTDEApplication", m_pApplicationShutdownFunc ); ++ lcl_getFunctionFromModuleOrUnload( m_hConnectorModule, "matchTDEVersion", m_pTDEVersionCheckFunc ); ++ ++ if ( !m_hConnectorModule ) @@ -7389,8 +7389,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++UDK_3_0_0 { ++ global: ++ createKabConnection; -++ initKApplication; -++ shutdownKApplication; +++ initTDEApplication; +++ shutdownTDEApplication; ++ matchTDEVersion; ++ local: ++ *; @@ -7577,7 +7577,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ { ++ private: ++ /// TDE application if we own it -++ static KApplication* s_pKApplication; +++ static TDEApplication* s_pTDEApplication; ++ static bool s_bDidInsertCatalogue; ++ ++ public: @@ -7586,7 +7586,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ }; ++ ++ // --------------------------------------------------------------- -++ KApplication* TDEInit::s_pKApplication = NULL; +++ TDEApplication* TDEInit::s_pTDEApplication = NULL; ++ bool TDEInit::s_bDidInsertCatalogue = false; ++ ++ // --------------------------------------------------------------- @@ -7595,14 +7595,14 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ // TODO: All this is not thread-safe ++ ++ // we create a TDE application only if it is not already done -++ if (KApplication::kApplication() == NULL) +++ if (TDEApplication::kApplication() == NULL) ++ { -++ OSL_ENSURE(s_pKApplication == NULL, "TDEInit::Init: inconsistency in the application pointers!"); +++ OSL_ENSURE(s_pTDEApplication == NULL, "TDEInit::Init: inconsistency in the application pointers!"); ++ ++ char *kabargs[1] = {(char*)"libkab1"}; ++ KCmdLineArgs::init(1, kabargs, "KAddressBook", *kabargs, "Address Book driver", KAB_DRIVER_VERSION); ++ -++ s_pKApplication = new KApplication(false, false); +++ s_pTDEApplication = new TDEApplication(false, false); ++ } ++ ++ // set language @@ -7627,10 +7627,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ // which we did not previously insert ++ KGlobal::locale()->removeCatalogue("kaddressbook"); ++ -++ if ( s_pKApplication != NULL ) +++ if ( s_pTDEApplication != NULL ) ++ { -++ delete s_pKApplication; -++ s_pKApplication = NULL; +++ delete s_pTDEApplication; +++ s_pTDEApplication = NULL; ++ } ++ } ++ } @@ -7646,13 +7646,13 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++} ++ ++// ----------------------------------------------------------------------- -++extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL initKApplication() +++extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL initTDEApplication() ++{ ++ ::connectivity::kab::TDEInit::Init(); ++} ++ ++// ----------------------------------------------------------------------- -++extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL shutdownKApplication() +++extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL shutdownTDEApplication() ++{ ++ ::connectivity::kab::TDEInit::Shutdown(); ++} @@ -7661,7 +7661,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ by the driver ++ ++ Has to be called before any other code from this library, in particular, -++ it has to be called before initKApplication() +++ it has to be called before initTDEApplication() ++ ++ If this function returns 0, then no other code from this library ++ has to be called, else the results are unpredictable. @@ -9043,7 +9043,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ ++ KLocale::setMainCatalogue( "kdialog" ); ++ -++ KApplication kApplication; +++ TDEApplication kApplication; ++ ++ // Setup the modality ++ KCmdLineArgs *pArgs = KCmdLineArgs::parsedArgs(); @@ -11951,7 +11951,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= ++ desktop; ++ enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TDE")) && -++ KApplication::kApplication() != 0; +++ TDEApplication::kApplication() != 0; ++ } ++} ++ @@ -15201,13 +15201,13 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++#include "i18n_im.hxx" ++#include "i18n_xkb.hxx" ++ -++/* #i59042# override KApplications method for session management +++/* #i59042# override TDEApplications method for session management ++ * since it will interfere badly with our own. ++ */ -++class VCLTDEApplication : public KApplication +++class VCLTDEApplication : public TDEApplication ++{ ++ public: -++ VCLTDEApplication() : KApplication() {} +++ VCLTDEApplication() : TDEApplication() {} ++ ++ virtual void commitData(QSessionManager &sm); ++}; @@ -15231,7 +15231,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ static_cast(GetXLib())->doStartup(); ++ // clean up own members ++ doDestruct(); -++ // prevent SalDisplay from closing KApplication's display +++ // prevent SalDisplay from closing TDEApplication's display ++ pDisp_ = NULL; ++} ++ @@ -15249,10 +15249,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ // we should use tde's method to signal screen changes similar ++ // to the gtk plugin ++ #if ! defined USE_RANDR || ! (defined LINUX && defined X86_64) -++ // properly deinitialize KApplication +++ // properly deinitialize TDEApplication ++ delete (VCLTDEApplication*)m_pApplication; ++ #endif -++ // free the faked cmdline arguments no longer needed by KApplication +++ // free the faked cmdline arguments no longer needed by TDEApplication ++ for( int i = 0; i < m_nFakeCmdLineArgs; i++ ) ++ free( m_pFreeCmdLineArgs[i] ); ++ delete [] m_pFreeCmdLineArgs; @@ -15308,15 +15308,15 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ m_pFreeCmdLineArgs[0] = strdup( aExec.getStr() ); ++ ++ // make a copy of the string list for freeing it since -++ // KApplication manipulates the pointers inside the argument vector -++ // note: KApplication bad ! +++ // TDEApplication manipulates the pointers inside the argument vector +++ // note: TDEApplication bad ! ++ m_pAppCmdLineArgs = new char*[ m_nFakeCmdLineArgs ]; ++ for( int i = 0; i < m_nFakeCmdLineArgs; i++ ) ++ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i]; ++ ++ KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData ); ++ -++ KApplication::disableAutoDcopRegistration(); +++ TDEApplication::disableAutoDcopRegistration(); ++ m_pApplication = new VCLTDEApplication(); ++ kapp->disableSessionManagement(); ++ -- cgit v1.2.3