diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
| commit | 92667c8edbaee9a252b1d5d221eb62849f76697c (patch) | |
| tree | 8f1d329f2259b7d5bff054bc14d0965637df6961 /sfx2/JunitTest_sfx2_complex.mk | |
| parent | baecdfb578cb7bc992944857ad4d8882ef7e842c (diff) | |
| parent | 48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
Diffstat (limited to 'sfx2/JunitTest_sfx2_complex.mk')
| -rwxr-xr-x | sfx2/JunitTest_sfx2_complex.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk index 0ab800aee9b5..8f09f3d799a9 100755 --- a/sfx2/JunitTest_sfx2_complex.mk +++ b/sfx2/JunitTest_sfx2_complex.mk @@ -42,18 +42,18 @@ $(eval $(call gb_JunitTest_add_jars,sfx2_complex,\ )) $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\ - sfx2/qa/complex/sfx2/tools/DialogThread \ - sfx2/qa/complex/sfx2/tools/WriterHelper \ - sfx2/qa/complex/sfx2/tools/TestDocument \ - sfx2/qa/complex/sfx2/GlobalEventBroadcaster \ + sfx2/qa/complex/sfx2/DocumentInfo \ sfx2/qa/complex/sfx2/DocumentMetadataAccess \ sfx2/qa/complex/sfx2/DocumentProperties \ - sfx2/qa/complex/sfx2/DocumentInfo \ + sfx2/qa/complex/sfx2/GlobalEventBroadcaster \ sfx2/qa/complex/sfx2/StandaloneDocumentInfo \ sfx2/qa/complex/sfx2/UndoManager \ sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest \ - sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper \ sfx2/qa/complex/sfx2/standalonedocinfo/Test01 \ + sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper \ + sfx2/qa/complex/sfx2/tools/DialogThread \ + sfx2/qa/complex/sfx2/tools/TestDocument \ + sfx2/qa/complex/sfx2/tools/WriterHelper \ sfx2/qa/complex/sfx2/undo/CalcDocumentTest \ sfx2/qa/complex/sfx2/undo/ChartDocumentTest \ sfx2/qa/complex/sfx2/undo/DocumentTest \ @@ -68,8 +68,9 @@ $(eval $(call gb_JunitTest_add_classes,sfx2_complex,\ complex.sfx2.DocumentInfo \ complex.sfx2.DocumentProperties \ complex.sfx2.DocumentMetadataAccess \ - complex.sfx2.UndoManager \ )) +# fd#35663 fails currently: +# complex.sfx2.UndoManager \ # #i115674# fails currently: misses some OnUnfocus event # complex.sfx2.GlobalEventBroadcaster \ # breaks because binfilter export has been removed |