← 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/automation-testtool-oobuildfix.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/automation-testtool-oobuildfix.diff
1
 
Index: automation/source/app/testbasi.cxx
2
 
===================================================================
3
 
RCS file: /cvs/util/automation/source/app/testbasi.cxx,v
4
 
retrieving revision 1.5
5
 
diff -u -p -r1.5 testbasi.cxx
6
 
--- automation/source/app/testbasi.cxx  7 Sep 2005 19:15:51 -0000       1.5
7
 
+++ automation/source/app/testbasi.cxx  3 Feb 2006 17:40:28 -0000
8
 
@@ -128,6 +128,10 @@ IMPL_LINK( TTBasic, CErrorImpl, ErrorEnt
9
 
 BOOL TTBasic::Compile( SbModule* p )
10
 
 {
11
 
        p->SetComment( ((TestToolObj*)pTestObject)->GetRevision(p->GetSource()) );
12
 
+       // the default ooo-build compatibilty options stuff
13
 
+       // up the testtool make sure they are false
14
 
+       p->SetCompatibleMode( false );
15
 
+
16
 
        SbModule* pOldModule = GetCompileModule();
17
 
        SetCompileModule( p );
18
 
        p->SetSource( ((TestToolObj*)pTestObject)->PreCompile(p->GetSource()) );
19
1
Index: automation/source/testtool/objtest.cxx
20
2
===================================================================
21
3
RCS file: /cvs/util/automation/source/testtool/objtest.cxx,v
23
5
diff -u -p -r1.20 objtest.cxx
24
6
--- automation/source/testtool/objtest.cxx      6 Oct 2005 12:37:43 -0000       1.20
25
7
+++ automation/source/testtool/objtest.cxx      3 Feb 2006 17:40:30 -0000
26
 
@@ -1849,6 +1849,10 @@ void TestToolObj::SFX_NOTIFY( SfxBroadca
27
 
                                                {
28
 
                                                        SbModule *pMod;
29
 
                                                        pMod = pBasic->MakeModule( CUniString("--"), String() );
30
 
+                                                                       if ( pMod )
31
 
+                                                                               // the default ooo-build compatibilty options stuff
32
 
+                                                                               // up the testtool
33
 
+                                                                               pMod->SetCompatibleMode( false );
34
 
                                                        pMod->Clear();
35
 
                                                        if ( Load( aFullPathname, pMod ) )
36
 
                                                        {
37
8
@@ -2715,7 +2719,8 @@ void TestToolObj::DebugFindNoErrors( BOO
38
9
 
39
10
 SbxVariable* TestToolObj::Find( const String& Str, SbxClassType Type)