summaryrefslogtreecommitdiffstats
path: root/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
diff options
context:
space:
mode:
Diffstat (limited to 'libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff')
-rw-r--r--libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff10
1 files changed, 5 insertions, 5 deletions
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index 81b9141..f397150 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -6655,7 +6655,7 @@ index 0000000..375b158
+ 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);
+ }
@@ -9365,15 +9365,15 @@ index 0000000..eb20aa3
+ ::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();
+
@@ -16078,7 +16078,7 @@ index 0000000..adeb628
+ 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();