diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:51:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:51:31 -0600 |
| commit | 124cd4e9efafa115583d19bcf65d9ee67ecaf87b (patch) | |
| tree | 8b6f9e54068ea4eda4fe2096aff9b4c48f0f7773 /libreoffice/3.3.3 | |
| parent | 6678123f8866f4128b08719affd53d2b39e548af (diff) | |
| download | thirdparty-124cd4e9efafa115583d19bcf65d9ee67ecaf87b.tar.gz thirdparty-124cd4e9efafa115583d19bcf65d9ee67ecaf87b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice/3.3.3')
| -rw-r--r-- | libreoffice/3.3.3/patches/libreoffice-trinity.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff index 17aa587..3f717cd 100644 --- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff @@ -7612,10 +7612,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ TQString aLanguage( ++ (const TQChar *) pProcessLocale->Language->buffer, ++ (int) pProcessLocale->Language->length); -++ KGlobal::locale()->setLanguage(aLanguage); +++ TDEGlobal::locale()->setLanguage(aLanguage); ++ ++ // load TDE address book's localized messages -++ KGlobal::locale()->insertCatalogue("kaddressbook"); +++ TDEGlobal::locale()->insertCatalogue("kaddressbook"); ++ s_bDidInsertCatalogue = true; ++ } ++ @@ -7625,7 +7625,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ if ( s_bDidInsertCatalogue ) ++ // this guard is necessary, since TDE 3.3 seems to crash if we remove a catalogue ++ // which we did not previously insert -++ KGlobal::locale()->removeCatalogue("kaddressbook"); +++ TDEGlobal::locale()->removeCatalogue("kaddressbook"); ++ ++ if ( s_pTDEApplication != NULL ) ++ { @@ -11480,7 +11480,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ TQFont aFixedFont; ++ short nFontHeight; ++ -++ aFixedFont = KGlobalSettings::fixedFont(); +++ aFixedFont = TDEGlobalSettings::fixedFont(); ++ nFontHeight = aFixedFont.pointSize(); ++ return css::beans::Optional< css::uno::Any >( ++ true, uno::makeAny( nFontHeight ) ); @@ -11491,7 +11491,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ TQString aFontName; ++ :: rtl::OUString sFontName; ++ -++ aFixedFont = KGlobalSettings::fixedFont(); +++ aFixedFont = TDEGlobalSettings::fixedFont(); ++ aFontName = aFixedFont.family(); ++ sFontName = (const sal_Unicode *) aFontName.ucs2(); ++ return css::beans::Optional< css::uno::Any >( @@ -11506,7 +11506,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ } else if (id.equalsAsciiL( ++ RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"))) ++ { -++ TQString aDocumentsDir( KGlobalSettings::documentPath() ); +++ TQString aDocumentsDir( TDEGlobalSettings::documentPath() ); ++ rtl::OUString sDocumentsDir; ++ rtl::OUString sDocumentsURL; ++ if ( aDocumentsDir.endsWith(TQChar('/')) ) @@ -14856,7 +14856,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ aStyleSettings.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); ++ ++ // WM settings -++ KConfig *pConfig = KGlobal::config(); +++ KConfig *pConfig = TDEGlobal::config(); ++ if ( pConfig ) ++ { ++ pConfig->setGroup( "WM" ); |