← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openoffice.org-l10n/karmic

« back to all changes in this revision

Viewing changes to ooo-build/patches/dev300/kde4-kdedata.cxx.diff

  • Committer: Bazaar Package Importer
  • Author(s): Chris Cheney
  • Date: 2009-08-13 16:30:00 UTC
  • mfrom: (1.1.26 upstream)
  • Revision ID: james.westby@ubuntu.com-20090813163000-ck1d5pxexe0jg8p4
Tags: 1:3.1.1~rc1-1ubuntu1
* Copy of the openoffice.org source.
  - debian/changelog: Change source name.
  - debian/control.in: Change source name.
  - debian/control: Regenerate control file.

* Resynchronise with Debian (r1631). Remaining changes:
  - Add Launchpad integration support.
  - Add Launchpad translations support.
  - Add package openoffice.org-style-human.
  - Add some Ubuntu-specific bitmaps. Adjust broffice diversions for these.
  - Add support for compressing debs with lzma.
  - Add support for shared /usr/share/doc directories.
  - Add support to build l10n as a separate source.
  - Add support to build on lpia.
  - Add support to turn off building on sparc.
  - Add Xb-Npp-xxx tags according to "firefox distro add-on suport" spec.
  - Use imagemagick instead of graphicsmagick.
  - openoffice.org-help switch to internal copy of lucene.
  - Disable gnome-vfs support since it is buggy.
  - Switch desktop files from %U to %F for gvfs fuse.
* Resynchronise with ooo-build-3-1-1 (7b03695ba14f142cfde58b4592af50cd60e3e787).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/dev300/kde4-kdedata.cxx.diff
1
 
--- vcl/unx/kde/kdedata.cxx.old 2008-03-22 05:08:32.000000000 +0100
2
 
+++ vcl/unx/kde/kdedata.cxx     2008-03-22 05:57:03.000000000 +0100
3
 
@@ -140,18 +140,22 @@
4
 
        XrmInitialize();
5
 
 
6
 
        KAboutData *kAboutData = new KAboutData( "OpenOffice.org",
7
 
-                       I18N_NOOP( "OpenOffice.org" ),
8
 
-                       "1.1.0",
9
 
-                       I18N_NOOP( "OpenOffice.org with KDE Native Widget Support." ),
10
 
+                       "OpenOffice.org",
11
 
+                       ki18n( "OpenOffice.org" ),
12
 
+                       "3.0.0",
13
 
+                       ki18n( "OpenOffice.org with KDE Native Widget Support." ),
14
 
                        KAboutData::License_LGPL,
15
 
-                       "(c) 2003, 2004 Novell, Inc",
16
 
-                       I18N_NOOP( "OpenOffice.org is an office suite.\n" ),
17
 
+                       ki18n( "Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008 Novell, Inc"),
18
 
+                       ki18n( "OpenOffice.org is an office suite.\n" ),
19
 
                        "http://kde.openoffice.org/index.html",
20
 
-                       "dev@kde.openoffice.org");
21
 
-       kAboutData->addAuthor( "Jan Holesovsky",
22
 
-                       I18N_NOOP( "Original author and maintainer of the KDE NWF." ),
23
 
+                       "dev@kde.openoffice.org" );
24
 
+       kAboutData->addAuthor( ki18n( "Jan Holesovsky" ),
25
 
+                       ki18n( "Original author and maintainer of the KDE NWF." ),
26
 
                        "kendy@artax.karlin.mff.cuni.cz",
27
 
                        "http://artax.karlin.mff.cuni.cz/~kendy" );
28
 
+       kAboutData->addAuthor( ki18n("Eric Bischoff"),
29
 
+                       ki18n( "Accessibility fixes, porting to KDE 4." ),
30
 
+                       "bischoff@kde.org" );
31
 
 
32
 
     m_nFakeCmdLineArgs = 1;
33
 
        USHORT nIdx;
34
 
@@ -191,11 +195,10 @@
35
 
 
36
 
        KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
37
 
 
38
 
-       KApplication::disableAutoDcopRegistration();
39
 
        m_pApplication = new VCLKDEApplication();
40
 
-    kapp->disableSessionManagement();
41
 
+       kapp->disableSessionManagement();
42
 
        
43
 
-       Display* pDisp = QPaintDevice::x11AppDisplay();
44
 
+       Display* pDisp = QX11Info::display();
45
 
 
46
 
        SalDisplay *pSalDisplay = new SalKDEDisplay( pDisp );
47