From d337ac30737f8bc19e55bbafbb9fe1fdc3c08d86 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 21 Jan 2013 18:57:32 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- libreoffice/3.3.3/patches/libreoffice-trinity.diff | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libreoffice/3.3.3/patches') diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff index f5ee02d..b79bf96 100644 --- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff @@ -7600,7 +7600,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ 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); +++ TDECmdLineArgs::init(1, kabargs, "KAddressBook", *kabargs, "Address Book driver", KAB_DRIVER_VERSION); ++ ++ s_pTDEApplication = new TDEApplication(false, false); ++ } @@ -9038,15 +9038,15 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ ::std::cerr << "tdefilepicker, an implementation of TDE file dialog for OOo." << ::std::endl ++ << "Type 'exit' and press Enter to finish." << ::std::endl; ++ -++ KCmdLineArgs::addCmdLineOptions( sOptions ); -++ KCmdLineArgs::init( argc, argv, &qAboutData ); +++ TDECmdLineArgs::addCmdLineOptions( sOptions ); +++ TDECmdLineArgs::init( argc, argv, &qAboutData ); ++ ++ KLocale::setMainCatalogue( "kdialog" ); ++ ++ TDEApplication kApplication; ++ ++ // Setup the modality -++ KCmdLineArgs *pArgs = KCmdLineArgs::parsedArgs(); +++ TDECmdLineArgs *pArgs = TDECmdLineArgs::parsedArgs(); ++ long nWinId = atol( pArgs->getOption( "winid" ) ); ++ pArgs->clear(); ++ @@ -15314,7 +15314,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ for( int i = 0; i < m_nFakeCmdLineArgs; i++ ) ++ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i]; ++ -++ KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData ); +++ TDECmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData ); ++ ++ TDEApplication::disableAutoDcopRegistration(); ++ m_pApplication = new VCLTDEApplication(); -- cgit v1.2.1