← 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/src680/x-rh151357.setlangtolocale.diff

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2006-04-27 19:29:22 UTC
  • Revision ID: james.westby@ubuntu.com-20060427192922-2dburxv3b63f8v0u
Tags: 2.0.2-2ubuntu5
* Copy of the openoffice.org source.
  - debian/control.in: Change source name.
  - debian/changelog: Change source name.
  - debian/control: Regenerate control file.
* Add kurdish translations exported from Rosetta (2006-04-18).
* Workaround bad message strings in recently included GSI files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/src680/x-rh151357.setlangtolocale.diff
3
3
RCS file: /cvs/framework/desktop/source/app/langselect.cxx,v
4
4
retrieving revision 1.14
5
5
diff -u -p -r1.14 langselect.cxx
6
 
--- openoffice.org.orig/desktop/source/app/langselect.cxx       11 Mar 2005 10:47:45 -0000      1.14
 
6
--- desktop/source/app/langselect.cxx   11 Mar 2005 10:47:45 -0000      1.14
7
7
+++ desktop/source/app/langselect.cxx   29 Mar 2005 09:01:28 -0000
8
8
@@ -136,7 +136,7 @@ bool LanguageSelection::prepareLanguage(
9
9
     {
77
77
RCS file: /cvs/framework/desktop/source/app/langselect.hxx,v
78
78
retrieving revision 1.8
79
79
diff -u -p -r1.8 langselect.hxx
80
 
--- openoffice.org.orig/desktop/source/app/langselect.hxx       11 Mar 2005 10:47:59 -0000      1.8
 
80
--- desktop/source/app/langselect.hxx   11 Mar 2005 10:47:59 -0000      1.8
81
81
+++ desktop/source/app/langselect.hxx   29 Mar 2005 09:01:28 -0000
82
82
@@ -96,7 +96,7 @@ private:
83
83
 
93
93
RCS file: /cvs/framework/desktop/source/migration/wizard.cxx,v
94
94
retrieving revision 1.3
95
95
diff -u -p -r1.3 wizard.cxx
96
 
--- openoffice.org.orig/desktop/source/migration/wizard.cxx     11 Mar 2005 10:50:09 -0000      1.3
 
96
--- desktop/source/migration/wizard.cxx 11 Mar 2005 10:50:09 -0000      1.3
97
97
+++ desktop/source/migration/wizard.cxx 29 Mar 2005 09:01:44 -0000
98
98
@@ -590,25 +590,8 @@ OUString FirstStartWizard::getLicensePat
99
99
         // yuck! no license :/
126
126
===================================================================
127
127
RCS file: /cvs/framework/sfx2/source/appl/sfxhelp.cxx,v
128
128
retrieving revision 1.66
129
 
diff -u -p -u -r1.66 sfxhelp.cxx
130
 
--- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx    7 Sep 2005 17:47:17 -0000       1.66
131
 
+++ sfx2/source/appl/sfxhelp.cxx        24 Oct 2005 11:16:54 -0000
 
129
diff -u -r1.68 sfxhelp.cxx
 
130
--- sfx2/source/appl/sfxhelp.cxx        7 Feb 2006 10:29:33 -0000       1.68
 
131
+++ sfx2/source/appl/sfxhelp.cxx        28 Mar 2006 13:12:14 -0000
132
132
@@ -99,6 +99,9 @@
133
133
 #ifndef _URLOBJ_HXX
134
134
 #include <tools/urlobj.hxx>
151
151
 #include <rtl/uri.hxx>
152
152
 #include <vcl/msgbox.hxx>
153
153
 #include <svtools/ehdl.hxx>
154
 
@@ -165,16 +173,50 @@ void NoHelpErrorBox::RequestHelp( const 
 
154
@@ -165,16 +173,53 @@
155
155
 
156
156
 #define STARTERLIST 0
157
157
 
175
175
+                       rtl::OUString sHelpPath = aBaseInstallPath +
176
176
+                               rtl::OUString::createFromAscii(szHelpPath) + aLocaleStr;
177
177
+                       osl::DirectoryItem aDirItem;
 
178
+
178
179
+                       if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None)
179
180
+                       {
 
181
+                               bOk = false;
180
182
+                               String sLang(aLocaleStr);
181
183
+                               xub_StrLen nSepPos = sLang.Search( '-' );     
182
184
+                               if (nSepPos != STRING_NOTFOUND)
183
185
+                               {
 
186
+                                       bOk = true;
184
187
+                               sLang = sLang.Copy( 0, nSepPos );
185
188
+                                       sHelpPath = aBaseInstallPath +
186
189
+                                               rtl::OUString::createFromAscii(szHelpPath) + sLang;
210
213
 
211
214
        // query part exists?
212
215
        if ( bQuestionMark )
213
 
@@ -189,6 +231,7 @@ void AppendConfigToken_Impl( String& rUR
 
216
@@ -189,6 +234,7 @@
214
217
        rURL += String( aLocaleStr );
215
218
        rURL += DEFINE_CONST_UNICODE("&System=");
216
219
        rURL += SvtHelpOptions().GetSystem();
218
221
 }
219
222
 
220
223
 // -----------------------------------------------------------------------
221
 
@@ -426,11 +469,8 @@ SfxHelp::SfxHelp() :
 
224
@@ -426,11 +472,8 @@
222
225
 
223
226
        pImp = new SfxHelp_Impl( bIsDebug );
224
227
 
237
240
RCS file: /cvs/framework/framework/source/services/substitutepathvars.cxx,v
238
241
retrieving revision 1.10
239
242
diff -u -p -r1.10 substitutepathvars.cxx
240
 
--- openoffice.org.orig/framework/source/services/substitutepathvars.cxx        13 Jan 2005 19:14:36 -0000      1.10
 
243
--- framework/source/services/substitutepathvars.cxx    13 Jan 2005 19:14:36 -0000      1.10
241
244
+++ framework/source/services/substitutepathvars.cxx    29 Jun 2005 10:45:59 -0000
242
245
@@ -151,6 +151,14 @@
243
246
 #include <rtl/ustrbuf.hxx>
359
362
RCS file: /cvs/framework/framework/util/makefile.mk,v
360
363
retrieving revision 1.96
361
364
diff -u -p -r1.96 makefile.mk
362
 
--- openoffice.org.orig/framework/util/makefile.mk      22 Apr 2005 11:36:59 -0000      1.96
 
365
--- framework/util/makefile.mk  22 Apr 2005 11:36:59 -0000      1.96
363
366
+++ framework/util/makefile.mk  29 Jun 2005 10:45:59 -0000
364
367
@@ -212,6 +212,7 @@ SHL3STDLIBS=        \
365
368
                                $(CPPUHELPERLIB)                                        \
374
377
RCS file: /cvs/sw/sw/source/ui/misc/glosdoc.cxx,v
375
378
retrieving revision 1.19
376
379
diff -u -p -r1.19 glosdoc.cxx
377
 
--- openoffice.org.orig/sw/source/ui/misc/glosdoc.cxx   11 Jan 2005 12:42:19 -0000      1.19
 
380
--- sw/source/ui/misc/glosdoc.cxx       11 Jan 2005 12:42:19 -0000      1.19
378
381
+++ sw/source/ui/misc/glosdoc.cxx       29 Jun 2005 11:02:03 -0000
379
382
@@ -577,19 +577,7 @@ void SwGlossaries::UpdateGlosPath(sal_Bo
380
383
                }
402
405
RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
403
406
retrieving revision 1.107
404
407
diff -u -p -u -r1.107 Common.xcs
405
 
--- openoffice.org.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs      2 Feb 2005 16:41:38 -0000       1.107
 
408
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs  2 Feb 2005 16:41:38 -0000       1.107
406
409
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs  29 Jun 2005 11:08:26 -0000
407
410
@@ -1288,7 +1288,7 @@ Dymamic border coloring means that when 
408
411
                                                <author>OS</author>
445
448
RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java,v
446
449
retrieving revision 1.10
447
450
diff -u -p -u -r1.10 LetterWizardDialogImpl.java
448
 
--- openoffice.org.orig/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java 20 May 2005 15:42:29 -0000      1.10
 
451
--- wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java     20 May 2005 15:42:29 -0000      1.10
449
452
+++ wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java     13 Jul 2005 11:22:44 -0000
450
453
@@ -754,18 +754,38 @@ public class LetterWizardDialogImpl exte
451
454
                }
493
496
RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java,v
494
497
retrieving revision 1.5
495
498
diff -u -p -u -r1.5 LetterWizardDialogResources.java
496
 
--- openoffice.org.orig/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java    3 May 2005 14:23:44 -0000       1.5
 
499
--- wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java        3 May 2005 14:23:44 -0000       1.5
497
500
+++ wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java        13 Jul 2005 11:22:44 -0000
498
501
@@ -14,10 +14,10 @@ public class LetterWizardDialogResources
499
502
        final static int RID_LETTERWIZARDLANGUAGE_START = 3110;
540
543
RCS file: /cvs/util/xmlhelp/source/treeview/tvread.cxx,v
541
544
retrieving revision 1.16
542
545
diff -u -p -u -r1.16 tvread.cxx
543
 
--- openoffice.org.orig/xmlhelp/source/treeview/tvread.cxx      23 Mar 2005 13:04:52 -0000      1.16
 
546
--- xmlhelp/source/treeview/tvread.cxx  23 Mar 2005 13:04:52 -0000      1.16
544
547
+++ xmlhelp/source/treeview/tvread.cxx  24 Oct 2005 11:15:48 -0000
545
548
@@ -701,7 +701,9 @@ ConfigData TVChildTarget::init( const Re
546
549
                         osl::FileBase::E_None == osl::DirectoryItem::get( url + locale.copy( 0,idx ),
558
561
RCS file: /cvs/graphics/svx/source/dialog/optgdlg.cxx,v
559
562
retrieving revision 1.28
560
563
diff -u -r1.28 optgdlg.cxx
561
 
--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx   5 Jan 2006 17:58:40 -0000       1.28
 
564
--- svx/source/dialog/optgdlg.cxx       5 Jan 2006 17:58:40 -0000       1.28
562
565
+++ svx/source/dialog/optgdlg.cxx       1 Feb 2006 11:04:37 -0000
563
566
@@ -1183,8 +1183,6 @@
564
567
 /* -----------------------------23.11.00 13:06--------------------------------
898
901
RCS file: /cvs/graphics/svx/source/dialog/optgdlg.hxx,v
899
902
retrieving revision 1.16
900
903
diff -u -r1.16 optgdlg.hxx
901
 
--- openoffice.org.orig/svx/source/dialog/optgdlg.hxx   5 Jan 2006 17:59:05 -0000       1.16
 
904
--- svx/source/dialog/optgdlg.hxx       5 Jan 2006 17:59:05 -0000       1.16
902
905
+++ svx/source/dialog/optgdlg.hxx       1 Feb 2006 11:04:41 -0000
903
906
@@ -212,6 +212,10 @@
904
907
 
916
919
RCS file: /cvs/util/tools/source/rc/resmgr.cxx,v
917
920
retrieving revision 1.37
918
921
diff -u -p -r1.37 resmgr.cxx
919
 
--- openoffice.org.orig/tools/source/rc/resmgr.cxx      18 Mar 2005 17:45:56 -0000      1.37
 
922
--- tools/source/rc/resmgr.cxx  18 Mar 2005 17:45:56 -0000      1.37
920
923
+++ tools/source/rc/resmgr.cxx  29 Mar 2005 14:56:58 -0000
921
924
@@ -372,6 +372,21 @@ void ResMgrContainer::init()
922
925
     #endif
963
966
RCS file: /cvs/tools/solenv/bin/modules/installer/scriptitems.pm,v
964
967
retrieving revision 1.17
965
968
diff -u -p -r1.17 scriptitems.pm
966
 
--- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm     24 Feb 2005 16:21:15 -0000      1.17
 
969
--- solenv/bin/modules/installer/scriptitems.pm 24 Feb 2005 16:21:15 -0000      1.17
967
970
+++ solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000
968
971
@@ -930,8 +930,7 @@ sub remove_Files_Without_Sourcedirectory
969
972
                                $infoline = "ERROR: Removing file $filename from file list.\n";