[Libreoffice-commits] .: 14 commits - automation/util cui/Library_cui.mk cui/source extensions/source extensions/test extensions/workben forms/JunitTest_forms_complex.mk forms/JunitTest_forms_unoapi.mk forms/Library_frm.mk lingucomponent/source package/inc setup_native/prj setup_native/source wizards/AllLangResTarget_cal.mk wizards/AllLangResTarget_dbw.mk wizards/AllLangResTarget_eur.mk wizards/AllLangResTarget_imp.mk wizards/AllLangResTarget_tpl.mk wizards/AllLangResTarget_wwz.mk wizards/AllLangResTarget_wzi.mk wizards/com wizards/Jar_agenda.mk wizards/Jar_commonwizards.mk wizards/Jar_fax.mk wizards/Jar_form.mk wizards/Jar_letter.mk wizards/Jar_query.mk wizards/Jar_reportbuilder.mk wizards/Jar_report.mk wizards/Jar_table.mk wizards/Jar_web.mk wizards/Makefile wizards/Module_wizards.mk wizards/prj wizards/source wizards/util wizards/Zip_depot.mk wizards/Zip_euro.mk wizards/Zip_form.mk wizards/Zip_gimmicks.mk wizards/Zip_import.mk wizards/Zip_launcher.mk wizards/Zip_schedule.mk wizards/Zip _share.mk wizards/Zip_standard.mk wizards/Zip_template.mk wizards/Zip_tools.mk wizards/Zip_tutorials.mk wizards/Zip_usr.mk wizards/Zip_web.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:48:45 PDT 2011
automation/util/makefile.mk | 18
cui/Library_cui.mk | 3
cui/source/inc/cuitabarea.hxx | 2
extensions/source/abpilot/makefile.mk | 27
extensions/test/ole/AxTestComponents/AxTestComponents.cpp | 2
extensions/workben/testcomponent.cxx | 14
forms/JunitTest_forms_complex.mk | 2
forms/JunitTest_forms_unoapi.mk | 2
forms/Library_frm.mk | 8
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 20
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx | 7
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 20
lingucomponent/source/spellcheck/spell/sspellimp.hxx | 7
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 11
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 7
package/inc/HashMaps.hxx | 6
setup_native/prj/d.lst | 1
setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx | 2
wizards/AllLangResTarget_cal.mk | 45
wizards/AllLangResTarget_dbw.mk | 45
wizards/AllLangResTarget_eur.mk | 45
wizards/AllLangResTarget_imp.mk | 45
wizards/AllLangResTarget_tpl.mk | 45
wizards/AllLangResTarget_wwz.mk | 45
wizards/AllLangResTarget_wzi.mk | 47
wizards/Jar_agenda.mk | 62
wizards/Jar_commonwizards.mk | 134
wizards/Jar_fax.mk | 60
wizards/Jar_form.mk | 62
wizards/Jar_letter.mk | 63
wizards/Jar_query.mk | 55
wizards/Jar_report.mk | 66
wizards/Jar_reportbuilder.mk | 66
wizards/Jar_table.mk | 61
wizards/Jar_web.mk | 106
wizards/Makefile | 38
wizards/Module_wizards.mk | 64
wizards/Zip_depot.mk | 53
wizards/Zip_euro.mk | 45
wizards/Zip_form.mk | 42
wizards/Zip_gimmicks.mk | 42
wizards/Zip_import.mk | 41
wizards/Zip_launcher.mk | 33
wizards/Zip_schedule.mk | 44
wizards/Zip_share.mk | 35
wizards/Zip_standard.mk | 36
wizards/Zip_template.mk | 41
wizards/Zip_tools.mk | 42
wizards/Zip_tutorials.mk | 44
wizards/Zip_usr.mk | 35
wizards/Zip_web.mk | 40
wizards/com/sun/star/wizards/common/MANIFEST.MF | 1
wizards/com/sun/star/wizards/report/makefile.mk | 75
wizards/com/sun/star/wizards/reportbuilder/makefile.mk | 52
wizards/prj/build.lst | 28
wizards/prj/d.lst | 23
wizards/prj/makefile.mk | 40
wizards/source/config/makefile.mk | 52
wizards/source/configshare/makefile.mk | 38
wizards/source/depot/delzip | 1
wizards/source/depot/makefile.mk | 45
wizards/source/euro/makefile.mk | 53
wizards/source/formwizard/makefile.mk | 53
wizards/source/gimmicks/makefile.mk | 46
wizards/source/imagelists/makefile.mk | 50
wizards/source/importwizard/makefile.mk | 53
wizards/source/launcher/makefile.mk | 46
wizards/source/schedule/makefile.mk | 53
wizards/source/standard/makefile.mk | 45
wizards/source/template/makefile.mk | 54
wizards/source/tools/makefile.mk | 45
wizards/source/tutorials/makefile.mk | 45
wizards/source/webwizard/makefile.mk | 53
wizards/util/helpids.h | 859 -----
wizards/util/hidother.src | 1499 ----------
wizards/util/makefile.mk | 42
wizards/util/soffice.lnk | 248 -
wizards/util/target.pmk | 41
78 files changed, 1836 insertions(+), 3690 deletions(-)
New commits:
commit 01eada93cfc3abd68f4cf6070a848438ef68c7d8
Merge: 06ed8bf... 6567385...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jul 24 19:22:59 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 06ed8bfddc3a11536058b2c12366d47b28472e38
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 14:14:10 2011 +0200
use gb_Library_use_external in forms
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 02c4987..c58b3a9 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -35,11 +35,6 @@ $(eval $(call gb_Library_set_include,frm,\
-I$(realpath $(SRCDIR)/forms/source/inc) \
-I$(realpath $(SRCDIR)/forms/source/solar/inc) \
-I$(OUTDIR)/inc \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
-))
-
-$(eval $(call gb_Library_add_defs,frm,\
- $(if $(filter YES,$(SYSTEM_LIBXML)),-DSYSTEM_LIBXML $(filter-out -I%,$(LIBXML_CFLAGS))) \
))
$(eval $(call gb_Library_add_api,frm,\
@@ -67,9 +62,9 @@ $(eval $(call gb_Library_add_linked_libs,frm,\
ucbhelper \
utl \
vcl \
- xml2 \
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_use_external,frm,libxml2))
$(eval $(call gb_Library_set_componentfile,frm,forms/util/frm))
commit 1008123fce5ae5cffcbb11dff99d31453258f7db
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 21:30:02 2011 +0200
postmerge fixes for gnumake4
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index 046f6e0..fbbe474 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -49,18 +49,18 @@ SHL1TARGET= sts$(DLLPOSTFIX)
SHL1IMPLIB= ists
SHL1STDLIBS= \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
$(BASICLIB) \
- $(SALLIB) \
+ $(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(COMPHELPERLIB) \
- $(SOTLIB)
-
+ $(SALLIB) \
+ $(SOTLIB) \
+ $(SVLLIB) \
+ $(SVTLIB) \
+ $(SVTOOLLIB) \
+ $(TOOLSLIB) \
+ $(UNOTOOLSLIB) \
+ $(VCLLIB) \
.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= \
diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
index b205d9b..7f84828 100644
--- a/extensions/source/abpilot/makefile.mk
+++ b/extensions/source/abpilot/makefile.mk
@@ -79,19 +79,20 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1STDLIBS= \
- $(VCLLIB) \
- $(SALLIB) \
- $(TOOLSLIB) \
- $(CPPULIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(SFXLIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(TKLIB) \
- $(UNOTOOLSLIB) \
- $(SVXCORELIB) \
- $(SVXLIB)
+ $(COMPHELPERLIB) \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+ $(SALLIB) \
+ $(SFXLIB) \
+ $(SVLLIB) \
+ $(SVTLIB) \
+ $(SVTOOLLIB) \
+ $(SVXCORELIB) \
+ $(SVXLIB) \
+ $(TKLIB) \
+ $(TOOLSLIB) \
+ $(UNOTOOLSLIB) \
+ $(VCLLIB) \
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1IMPLIB= i$(TARGET)
commit adf7c3b1c101c080f1813ea5422386d2324fa977
Merge: 460adb0... c302693...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:34:26 2011 +0200
resyncing to master
diff --cc cui/Library_cui.mk
index 820e3da,5567650..6b23cb1
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@@ -35,10 -35,10 +35,9 @@@ $(eval $(call gb_Library_set_include,cu
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/cui/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,cui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,cui,\
$(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
$(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
$(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
diff --cc wizards/prj/build.lst
index 2c2a845,09c8333..97a8b05
--- a/wizards/prj/build.lst
+++ b/wizards/prj/build.lst
@@@ -1,2 -1,28 +1,2 @@@
- wz wizards : TRANSLATIONS:translations rsc javaunohelper unoil LIBXSLT:libxslt NULL
+ wz wizards : TRANSLATIONS:translations DESKTOP:rsc javaunohelper unoil LIBXSLT:libxslt NULL
-wz wizards\util nmake - all wz_util NULL
-wz wizards\source\config nmake - all wz_config NULL
-wz wizards\source\configshare nmake - all wz_configshare NULL
-wz wizards\source\imagelists nmake - all wz_imglists NULL
-wz wizards\source\euro nmake - all wz_eurowiz NULL
-wz wizards\source\formwizard nmake - all wz_reswiz NULL
-wz wizards\source\gimmicks nmake - all wz_gimmickswz NULL
-wz wizards\source\importwizard nmake - all wz_importwiz NULL
-wz wizards\source\schedule nmake - all wz_schedulewiz NULL
-wz wizards\source\template nmake - all wz_templatewiz NULL
-wz wizards\source\tools nmake - all wz_toolswiz NULL
-wz wizards\source\depot nmake - all wz_depot NULL
-wz wizards\source\tutorials nmake - all wz_tutorials NULL
-wz wizards\source\standard nmake - all wz_standard NULL
-wz wizards\com\sun\star\wizards nmake - all wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\query nmake - all wz_querywiz wz_formwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\report nmake - all wz_reportwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\reportbuilder\layout nmake - all wz_rptlayoutwiz wz_reportwiz NULL
-wz wizards\com\sun\star\wizards\reportbuilder nmake - all wz_rptbldwiz wz_rptlayoutwiz NULL
-wz wizards\com\sun\star\wizards\table nmake - all wz_tablewiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\form nmake - all wz_formwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\letter nmake - all wz_letterwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\fax nmake - all wz_faxwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\agenda nmake - all wz_agendawiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web\data nmake - all wz_webdata wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web\export nmake - all wz_webexport wz_webdata wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web nmake - all wz_webwiz wz_webexport NULL
+wz wizards\prj nmake - all wz_prj NULL
commit 460adb08fd0812c32315b45ebce76a8972deabf4
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 12:20:23 2011 +0200
gnumake4: move classpath to build system in wizards
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index e06ef0c..ba73cac 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -39,6 +39,8 @@ $(eval $(call gb_Jar_set_packageroot,commonwizards,com))
$(eval $(call gb_Jar_set_manifest,commonwizards,$(SRCDIR)/wizards/com/sun/star/wizards/common/MANIFEST.MF))
+$(eval $(call gb_Jar_set_jarclasspath,commonwizards,saxon9.jar))
+
$(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
wizards/com/sun/star/wizards/common/HelpIds \
wizards/com/sun/star/wizards/common/Desktop \
diff --git a/wizards/com/sun/star/wizards/common/MANIFEST.MF b/wizards/com/sun/star/wizards/common/MANIFEST.MF
index a670e80..e69de29 100644
--- a/wizards/com/sun/star/wizards/common/MANIFEST.MF
+++ b/wizards/com/sun/star/wizards/common/MANIFEST.MF
@@ -1 +0,0 @@
-Class-Path: saxon9.jar
commit deacdbe43f5d3366b7c597f68a86a0169a803c83
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jun 21 15:25:26 2011 +0200
gnumake4: postmerge fixes in cui
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 6e3bf19..820e3da 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,cui,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,cui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,cui,\
$(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
$(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
$(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
commit b5cbdf3a5a0dc75307bf53834931fba93418c82d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 13:45:00 2011 +0200
gnumake4: fix lingucompoment buildbreaker
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index eebdfb5..13246bd 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -107,9 +107,6 @@ SpellChecker::~SpellChecker()
aDLocs = NULL;
delete[] aDNames;
aDNames = NULL;
- if (xPropHelper.is())
- pPropHelper->RemoveAsPropListener();
- delete pPropHelper;
}
PropertyHelper_Spelling & SpellChecker::GetPropHelper_Impl()
@@ -597,7 +594,6 @@ void SAL_CALL SpellChecker::dispose()
bDisposing = sal_True;
EventObject aEvtObj( (XSpellChecker *) this );
aEvtListeners.disposeAndClear( aEvtObj );
- xPropHelper.clear();
}
}
commit b416dc4b2b272ce7955ea477183db7da8b4e1c24
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 13:24:10 2011 +0200
gnumake4: fix buildbreakers from merge
diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk
index 9631879..420b051 100644
--- a/forms/JunitTest_forms_complex.mk
+++ b/forms/JunitTest_forms_complex.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_JunitTest_JunitTest,forms_complex))
+$(eval $(call gb_JunitTest_JunitTest,forms_complex, SRCDIR))
$(eval $(call gb_JunitTest_add_jars,forms_complex,\
$(OUTDIR)/bin/OOoRunner.jar \
diff --git a/forms/JunitTest_forms_unoapi.mk b/forms/JunitTest_forms_unoapi.mk
index 931d8ae..68e2a00 100644
--- a/forms/JunitTest_forms_unoapi.mk
+++ b/forms/JunitTest_forms_unoapi.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_JunitTest_JunitTest,forms_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,forms_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,forms_unoapi,\
$$(DEFS) \
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 1208fa5..6804d61 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,frm,\
$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
))
-$(eval $(call gb_Library_set_defs,frm,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,frm,\
$(if $(filter YES,$(SYSTEM_LIBXML)),-DSYSTEM_LIBXML $(filter-out -I%,$(LIBXML_CFLAGS))) \
))
commit c28c3b962e5e7ba0fc09627a98d01143b7e1c5fd
Merge: 17a09fe... 840db10...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jun 19 12:54:22 2011 +0200
Merge branch 'master' into feature/gnumake4
Conflicts:
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
setup_native/prj/build.lst
setup_native/prj/d.lst
wizards/Jar_query.mk
wizards/Module_wizards.mk
wizards/Zip_launcher.mk
wizards/com/sun/star/wizards/report/makefile.mk
wizards/prj/build.lst
wizards/prj/d.lst
wizards/util/target.pmk
diff --cc cui/source/inc/cuitabarea.hxx
index 9a1909b,884c2de..56fb993
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@@ -356,8 -345,8 +345,8 @@@ private
XColorTable* pColorTab;
ChangeType* pnColorTableState;
- sal_uInt16 nPageType; //add CHINA001
- sal_uInt16 nDlgType; //add CHINA001
+ sal_uInt16 nPageType;
- sal_uInt16 nDlgType;
++ sal_uInt16 nDlgType;
sal_uInt16* pPos;
sal_Bool* pbAreaTP;
diff --cc extensions/test/ole/AxTestComponents/AxTestComponents.cpp
index 50ad668,7d82204..c8b8c75
--- a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp
+++ b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp
@@@ -97,4 -96,6 +96,6 @@@ STDAPI DllUnregisterServer(void
}
--//VT_I4 size_t V_ERROR VARIANT VARIANT_FALSE CComVariant FADF_EMBEDDED
++//VT_I4 size_t V_ERROR VARIANT VARIANT_FALSE CComVariant FADF_EMBEDDED
+
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc extensions/workben/testcomponent.cxx
index 9f70fcd,3d94279..1065c6f
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@@ -74,7 -75,7 +75,7 @@@ int __LOADONCALLAPI main (int argc, cha
#endif
// create service manager
--// XMultiServiceFactoryRef xSMgr = getProcessServiceManager();
++// XMultiServiceFactoryRef xSMgr = getProcessServiceManager();
XMultiServiceFactoryRef xSMgr = createRegistryServiceManager();
OSL_ASSERT( xSMgr.is() );
registerUsrServices( xSMgr );
@@@ -83,18 -84,13 +84,13 @@@
XImplementationRegistrationRef xReg;
XSimpleRegistryRef xSimpleReg;
-- try {
++ try {
// Create registration service
XInterfaceRef x = xSMgr->createInstance(
- UString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) );
+ UString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.ImplementationRegistration" )) );
x->queryInterface( XImplementationRegistration::getSmartUik() , xReg );
- /* x = xSMgr->createInstance( L"stardiv.uno.repos.SimpleRegistry" );
- OSL_ASSERT( x.is() );
- x->queryInterface( XSimpleRegistry::getSmartUik() , xSimpleReg );
- OSL_ASSERT( xSimpleReg.is() );
- xSimpleReg->open( L"testcomp.rdb" , FALSE , TRUE );
- */ }
- }
++ }
catch( Exception& e ) {
printf( "%s\n" , OWStringToOString( e.getName() , CHARSET_SYSTEM ).getStr() );
exit(1);
@@@ -167,11 -163,11 +163,11 @@@
XInterfaceRef x = xSMgr->createInstance( OStringToOWString( argv[1] , CHARSET_SYSTEM ) );
if( ! x.is() ) {
printf( "Couldn't instantiate service !\n" );
-- exit( 1 );
++ exit( 1 );
}
// do the test
-- try {
++ try {
nNewHandle = xTest->test( OStringToOWString( argv[1] , CHARSET_SYSTEM ) , x , nHandle );
}
catch ( Exception& e ) {
@@@ -193,7 -189,7 +189,7 @@@
for( ; nWarningCount < seqWarnings.getLen() ; nWarningCount ++ ) {
printf( "Warning\n%s\n---------\n" ,
OWStringToOString( seqWarnings.getArray()[nWarningCount], CHARSET_SYSTEM ).getStr() );
-- }
++ }
}
@@@ -213,7 -209,7 +209,7 @@@
printf( "Test passed !\n" );
}
else {
-- printf( "Test failed !\n" );
++ printf( "Test failed !\n" );
}
XComponentRef rComp( xSMgr , USR_QUERY );
diff --cc lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index b204402,0c12830..6cc84e3
mode 100755,100644..100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@@ -103,22 -100,20 +100,21 @@@ Hyphenator::~Hyphenator(
if (pPropHelper)
pPropHelper->RemoveAsPropListener();
- if ((numdict) && (aDicts))
+ if (numdict && aDicts)
{
- for (int i=0; i < numdict; i++)
+ for (int i=0; i < numdict; ++i)
{
- if (aDicts[i].apCC) delete aDicts[i].apCC;
- aDicts[i].apCC = NULL;
+ delete aDicts[i].apCC;
+ if (aDicts[i].aPtr)
+ hnj_hyphen_free(aDicts[i].aPtr);
}
- }
- if (aDicts) delete[] aDicts;
- aDicts = NULL;
- numdict = 0;
+ delete pPropHelper;
- }
+ }
+ delete[] aDicts;
+ }
-PropertyHelper_Hyphen & Hyphenator::GetPropHelper_Impl()
+PropertyHelper_Hyphenation& Hyphenator::GetPropHelper_Impl()
{
if (!pPropHelper)
{
@@@ -712,10 -706,8 +706,8 @@@ Reference< XPossibleHyphens > SAL_CALL
}
hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear();
- //fprintf(stderr,"result is %s\n",OU2A(hyphenatedWord));
- //fflush(stderr);
- xRes = new PossibleHyphens( aWord, LocaleToLanguage( aLocale ),
+ xRes = PossibleHyphens::CreatePossibleHyphens( aWord, LocaleToLanguage( aLocale ),
hyphenatedWord, aHyphPos );
delete[] hyphens;
@@@ -858,12 -851,12 +850,11 @@@ void SAL_CALL Hyphenator::initialize( c
//! And the reference to the UNO-functions while increasing
//! the ref-count and will implicitly free the memory
//! when the object is not longer used.
- pPropHelper = new PropertyHelper_Hyphen( (XHyphenator *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Hyphenation( (XHyphenator *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
- else
- {
- DBG_ERROR( "wrong number of arguments in sequence" );
+ else {
+ OSL_FAIL( "wrong number of arguments in sequence" );
}
}
}
diff --cc lingucomponent/source/spellcheck/spell/sspellimp.cxx
index f00f005,3a9854b..eebdfb5
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@@ -98,19 -101,17 +101,18 @@@ SpellChecker::~SpellChecker(
}
aDicts = NULL;
numdict = 0;
- if (aDEncs) delete[] aDEncs;
+ delete[] aDEncs;
aDEncs = NULL;
- if (aDLocs) delete[] aDLocs;
+ delete[] aDLocs;
aDLocs = NULL;
- if (aDNames) delete[] aDNames;
+ delete[] aDNames;
aDNames = NULL;
- if (pPropHelper)
+ if (xPropHelper.is())
pPropHelper->RemoveAsPropListener();
+ delete pPropHelper;
}
-
-PropertyHelper_Spell & SpellChecker::GetPropHelper_Impl()
+PropertyHelper_Spelling & SpellChecker::GetPropHelper_Impl()
{
if (!pPropHelper)
{
@@@ -575,12 -582,12 +577,11 @@@ void SAL_CALL SpellChecker::initialize
//! And the reference to the UNO-functions while increasing
//! the ref-count and will implicitly free the memory
//! when the object is not longer used.
- pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Spelling( (XSpellChecker *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
- else
- {
- DBG_ERROR( "wrong number of arguments in sequence" );
+ else {
+ OSL_FAIL( "wrong number of arguments in sequence" );
}
}
}
diff --cc package/inc/HashMaps.hxx
index 24e86bc,5ec543e..8f6c358
--- a/package/inc/HashMaps.hxx
+++ b/package/inc/HashMaps.hxx
@@@ -45,17 -46,17 +46,17 @@@ namespace com { namespace sun { namespa
class ContentInfo;
} } } }
- typedef std::hash_map < rtl::OUString,
-typedef boost::unordered_map < rtl::OUString,
++typedef boost::unordered_map < rtl::OUString,
ZipPackageFolder *,
::rtl::OUStringHash,
eqFunc > FolderHash;
- typedef std::hash_map < rtl::OUString,
- vos::ORef < com::sun::star::packages::ContentInfo >,
-typedef boost::unordered_map < rtl::OUString,
++typedef boost::unordered_map < rtl::OUString,
+ rtl::Reference < com::sun::star::packages::ContentInfo >,
::rtl::OUStringHash,
eqFunc > ContentHash;
- typedef std::hash_map < rtl::OUString,
-typedef boost::unordered_map < rtl::OUString,
++typedef boost::unordered_map < rtl::OUString,
ZipEntry,
rtl::OUStringHash,
eqFunc > EntryHash;
diff --cc setup_native/prj/d.lst
index 3a5b800,deac2fd..d57569b
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@@ -1,61 -1,56 +1,55 @@@
- mkdir: %_DEST%\bin%_EXT%\osl
- mkdir: %_DEST%\bin%_EXT%\broffice
- ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
- ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
- ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
+ mkdir: %_DEST%\bin\osl
+ ..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+ ..\%__SRC%\bin\*.exe %_DEST%\bin\*.exe
+ ..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
- mkdir: %_DEST%\bin%_EXT%\userscripts
- ..\%__SRC%\bin\install %_DEST%\bin%_EXT%\userscripts\install
- ..\%__SRC%\bin\uninstall %_DEST%\bin%_EXT%\userscripts\uninstall
- ..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin%_EXT%\openoffice.org-userland-1.0-0.noarch.rpm
+ mkdir: %_DEST%\bin\userscripts
+ ..\%__SRC%\bin\install %_DEST%\bin\userscripts\install
+ ..\%__SRC%\bin\uninstall %_DEST%\bin\userscripts\uninstall
+ ..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin\openoffice.org-userland-1.0-0.noarch.rpm
- mkdir: %_DEST%\bin%_EXT%\osolsmf
- ..\%__SRC%\bin\ulfconv %_DEST%\bin%_EXT%\ulfconv
- ..\%__SRC%\bin\langpackscript.sh %_DEST%\bin%_EXT%\langpackscript.sh
- ..\%__SRC%\bin\linuxpatchscript.sh %_DEST%\bin%_EXT%\linuxpatchscript.sh
- ..\%__SRC%\bin\downloadscript.sh %_DEST%\bin%_EXT%\downloadscript.sh
- ..\%__SRC%\bin\register_extensions %_DEST%\bin%_EXT%\register_extensions
- ..\%__SRC%\bin\deregister_extensions %_DEST%\bin%_EXT%\deregister_extensions
- ..\%__SRC%\bin\unpack_update.sh %_DEST%\bin%_EXT%\unpack_update
- ..\%__SRC%\bin\update.sh %_DEST%\bin%_EXT%\update
- ..\%__SRC%\bin\javaloader.sh %_DEST%\bin%_EXT%\javaloader.sh
- ..\%__SRC%\bin\stclient_wrapper.sh %_DEST%\bin%_EXT%\stclient_wrapper
- ..\%__SRC%\bin\stclient_wrapper.exe %_DEST%\bin%_EXT%\stclient_wrapper.exe
- ..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin%_EXT%\*.ulf
- ..\source\win32\msi-encodinglist.txt %_DEST%\bin%_EXT%\msi-encodinglist.txt
- ..\source\win32\patchlist.txt %_DEST%\bin%_EXT%\patchlist.txt
- ..\source\win32\desktophelper.txt %_DEST%\bin%_EXT%\desktophelper.txt
- ..\source\win32\get_retval.bat %_DEST%\bin%_EXT%\get_retval.bat
- ..\source\win32\nsis\downloadtemplate.nsi %_DEST%\bin%_EXT%\downloadtemplate.nsi
- ..\source\win32\nsis\*.ico %_DEST%\bin%_EXT%\*.ico
- ..\source\win32\nsis\*.bmp %_DEST%\bin%_EXT%\*.bmp
- ..\source\linux\*.dat %_DEST%\bin%_EXT%\*.dat
- ..\source\mac\*.icns %_DEST%\bin%_EXT%\*.icns
- ..\source\mac\Info.plist.langpack %_DEST%\bin%_EXT%\Info.plist.langpack
- ..\source\mac\ooo\osxdndinstall.png %_DEST%\bin%_EXT%\osl\osxdndinstall.png
- ..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png
- ..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store
- ..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack
- ..\source\mac\broffice\osxdndinstall.png %_DEST%\bin%_EXT%\broffice\osxdndinstall.png
- ..\source\mac\broffice\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\broffice\osxdndinstall_nologo.png
- ..\source\mac\broffice\DS_Store %_DEST%\bin%_EXT%\broffice\DS_Store
- ..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
- ..\source\java\brofficeorg_setup.gif %_DEST%\bin%_EXT%\broffice\Setup.gif
- ..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
- ..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat
- ..\source\opensolaris\bundledextensions\installed %_DEST%\bin%_EXT%\osolsmf\installed
- ..\source\opensolaris\bundledextensions\README %_DEST%\bin%_EXT%\osolsmf\README
- ..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin%_EXT%\osolsmf\ooo_bundled_extensions.xml
- ..\source\opensolaris\bundledextensions\svc-ooo_bundled_extensions %_DEST%\bin%_EXT%\osolsmf\svc-ooo_bundled_extensions
- ..\source\packinfo\solariscopyrightfile %_DEST%\bin%_EXT%\solariscopyrightfile
- ..\source\packinfo\linuxcopyrightfile %_DEST%\bin%_EXT%\linuxcopyrightfile
- ..\source\packinfo\*.txt %_DEST%\bin%_EXT%\*.txt
- ..\source\packinfo\*.pcp %_DEST%\bin%_EXT%\*.pcp
- ..\scripts\admin.pl %_DEST%\bin%_EXT%\admin.pl
- ..\scripts\*.txt %_DEST%\bin%_EXT%\*.txt
- ..\scripts\mac_install.script %_DEST%\bin%_EXT%\mac_install.script
- ..\scripts\osx_install_languagepack.applescript %_DEST%\bin%_EXT%\osx_install_languagepack.applescript
- ..\scripts\osx_install_patch.applescript %_DEST%\bin%_EXT%\osx_install_patch.applescript
+ mkdir: %_DEST%\bin\osolsmf
+ ..\%__SRC%\bin\ulfconv %_DEST%\bin\ulfconv
+ ..\%__SRC%\bin\langpackscript.sh %_DEST%\bin\langpackscript.sh
+ ..\%__SRC%\bin\linuxpatchscript.sh %_DEST%\bin\linuxpatchscript.sh
+ ..\%__SRC%\bin\downloadscript.sh %_DEST%\bin\downloadscript.sh
+ ..\%__SRC%\bin\register_extensions %_DEST%\bin\register_extensions
+ ..\%__SRC%\bin\deregister_extensions %_DEST%\bin\deregister_extensions
+ ..\%__SRC%\bin\unpack_update.sh %_DEST%\bin\unpack_update
+ ..\%__SRC%\bin\update.sh %_DEST%\bin\update
+ ..\%__SRC%\bin\javaloader.sh %_DEST%\bin\javaloader.sh
+ ..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin\*.ulf
+ ..\source\win32\msi-encodinglist.txt %_DEST%\bin\msi-encodinglist.txt
+ ..\source\win32\patchlist.txt %_DEST%\bin\patchlist.txt
+ ..\source\win32\desktophelper.txt %_DEST%\bin\desktophelper.txt
+ ..\source\win32\get_retval.bat %_DEST%\bin\get_retval.bat
+ ..\source\win32\nsis\downloadtemplate.nsi %_DEST%\bin\downloadtemplate.nsi
+ ..\source\win32\nsis\*.ico %_DEST%\bin\*.ico
+ ..\source\win32\nsis\*.bmp %_DEST%\bin\*.bmp
+ ..\source\linux\*.dat %_DEST%\bin\*.dat
+ ..\source\mac\*.icns %_DEST%\bin\*.icns
+ ..\source\mac\Info.plist.langpack %_DEST%\bin\Info.plist.langpack
+ ..\source\mac\ooo\osxdndinstall.png %_DEST%\bin\osl\osxdndinstall.png
+ ..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin\osl\osxdndinstall_nologo.png
+ ..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store
+ ..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack
+ ..\source\java\openofficeorg_setup.gif %_DEST%\bin\osl\Setup.gif
+ ..\source\java\javaversion.dat %_DEST%\bin\javaversion.dat
+ ..\source\java\javaversion2.dat %_DEST%\bin\javaversion2.dat
+ ..\source\opensolaris\bundledextensions\installed %_DEST%\bin\osolsmf\installed
+ ..\source\opensolaris\bundledextensions\README %_DEST%\bin\osolsmf\README
+ ..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin\osolsmf\ooo_bundled_extensions.xml
+ ..\source\opensolaris\bundledextensions\svc-ooo_bundled_extensions %_DEST%\bin\osolsmf\svc-ooo_bundled_extensions
+ ..\source\packinfo\solariscopyrightfile %_DEST%\bin\solariscopyrightfile
+ ..\source\packinfo\linuxcopyrightfile %_DEST%\bin\linuxcopyrightfile
+ ..\source\packinfo\*.txt %_DEST%\bin\*.txt
+ ..\source\packinfo\*.pcp %_DEST%\bin\*.pcp
+ ..\scripts\admin.pl %_DEST%\bin\admin.pl
+ ..\scripts\*.txt %_DEST%\bin\*.txt
+ ..\scripts\mac_install.script %_DEST%\bin\mac_install.script
+ ..\scripts\osx_install_languagepack.applescript %_DEST%\bin\osx_install_languagepack.applescript
+ ..\scripts\osx_install_patch.applescript %_DEST%\bin\osx_install_patch.applescript
- ..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so
+ ..\%__SRC%\lib\getuid.so %_DEST%\bin\getuid.so
+ ..\inc\setup_native\qswin32.h %_DEST%\inc\setup_native\qswin32.h
-
diff --cc wizards/Jar_query.mk
index a915c40,0000000..2183238
mode 100644,000000..100644
--- a/wizards/Jar_query.mk
+++ b/wizards/Jar_query.mk
@@@ -1,56 -1,0 +1,55 @@@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,query,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,query,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/commonwizards.jar \
+))
-
+$(eval $(call gb_Jar_set_manifest,query,$(SRCDIR)/wizards/com/sun/star/wizards/query/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_packageroot,query,com))
+
+$(eval $(call gb_Jar_set_jarclasspath,query,\
+ commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,query,\
+ wizards/com/sun/star/wizards/query/CallQueryWizard \
+ wizards/com/sun/star/wizards/query/Finalizer \
+ wizards/com/sun/star/wizards/query/QuerySummary \
+ wizards/com/sun/star/wizards/query/QueryWizard \
+))
+
+$(eval $(call gb_Jar_set_componentfile,query,wizards/com/sun/star/wizards/query/query,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --cc wizards/Zip_launcher.mk
index 20efead,0000000..091b4a4
mode 100644,000000..100644
--- a/wizards/Zip_launcher.mk
+++ b/wizards/Zip_launcher.mk
@@@ -1,36 -1,0 +1,33 @@@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
-
+$(eval $(call gb_Zip_Zip,basicsrvlauncher,$(SRCDIR)/wizards/source/launcher))
-
+$(eval $(call gb_Zip_add_files,basicsrvlauncher,\
+ dialog.xlb \
+ DicOOo.xba \
+ script.xlb \
+))
-
+# vim: set noet sw=4 ts=4:
diff --cc wizards/prj/build.lst
index e4037a0,0b8b1e0..2c2a845
--- a/wizards/prj/build.lst
+++ b/wizards/prj/build.lst
@@@ -1,2 -1,28 +1,2 @@@
- wz wizards : L10N:l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL
+ wz wizards : TRANSLATIONS:translations rsc javaunohelper unoil LIBXSLT:libxslt NULL
-wz wizards\util nmake - all wz_util NULL
-wz wizards\source\config nmake - all wz_config NULL
-wz wizards\source\configshare nmake - all wz_configshare NULL
-wz wizards\source\imagelists nmake - all wz_imglists NULL
-wz wizards\source\euro nmake - all wz_eurowiz NULL
-wz wizards\source\formwizard nmake - all wz_reswiz NULL
-wz wizards\source\gimmicks nmake - all wz_gimmickswz NULL
-wz wizards\source\importwizard nmake - all wz_importwiz NULL
-wz wizards\source\schedule nmake - all wz_schedulewiz NULL
-wz wizards\source\template nmake - all wz_templatewiz NULL
-wz wizards\source\tools nmake - all wz_toolswiz NULL
-wz wizards\source\depot nmake - all wz_depot NULL
-wz wizards\source\tutorials nmake - all wz_tutorials NULL
-wz wizards\source\standard nmake - all wz_standard NULL
-wz wizards\com\sun\star\wizards nmake - all wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\query nmake - all wz_querywiz wz_formwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\report nmake - all wz_reportwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\reportbuilder\layout nmake - all wz_rptlayoutwiz wz_reportwiz NULL
-wz wizards\com\sun\star\wizards\reportbuilder nmake - all wz_rptbldwiz wz_rptlayoutwiz NULL
-wz wizards\com\sun\star\wizards\table nmake - all wz_tablewiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\form nmake - all wz_formwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\letter nmake - all wz_letterwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\fax nmake - all wz_faxwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\agenda nmake - all wz_agendawiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web\data nmake - all wz_webdata wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web\export nmake - all wz_webexport wz_webdata wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web nmake - all wz_webwiz wz_webexport NULL
+wz wizards\prj nmake - all wz_prj NULL
commit 17a09feea5ed9c93cde886dabf12e498a30a52bc
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Apr 1 20:47:04 2011 +0000
gnumake4: #i117340#: JavaClassSet: adapt users [hg:efb3d33ce8ca]
diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk
index d18b3eb..289b9be 100644
--- a/wizards/Jar_agenda.mk
+++ b/wizards/Jar_agenda.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,agenda))
+$(eval $(call gb_Jar_Jar,agenda,SRCDIR))
$(eval $(call gb_Jar_add_jars,agenda,\
$(OUTDIR)/bin/ridl.jar \
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index 5d5d18d..e06ef0c 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,commonwizards))
+$(eval $(call gb_Jar_Jar,commonwizards,SRCDIR))
$(eval $(call gb_Jar_add_jars,commonwizards,\
$(OUTDIR)/bin/ridl.jar \
diff --git a/wizards/Jar_fax.mk b/wizards/Jar_fax.mk
index 9177edc..b189bd9 100644
--- a/wizards/Jar_fax.mk
+++ b/wizards/Jar_fax.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,fax))
+$(eval $(call gb_Jar_Jar,fax,SRCDIR))
$(eval $(call gb_Jar_add_jars,fax,\
$(OUTDIR)/bin/ridl.jar \
diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk
index fca7011..128b33d 100644
--- a/wizards/Jar_form.mk
+++ b/wizards/Jar_form.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,form))
+$(eval $(call gb_Jar_Jar,form,SRCDIR))
$(eval $(call gb_Jar_add_jars,form,\
$(OUTDIR)/bin/ridl.jar \
diff --git a/wizards/Jar_letter.mk b/wizards/Jar_letter.mk
index 925d487..270bc5c 100644
--- a/wizards/Jar_letter.mk
+++ b/wizards/Jar_letter.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,letter))
+$(eval $(call gb_Jar_Jar,letter,SRCDIR))
$(eval $(call gb_Jar_add_jars,letter,\
$(OUTDIR)/bin/ridl.jar \
diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk
index 0c8d26f..a915c40 100644
--- a/wizards/Jar_query.mk
+++ b/wizards/Jar_query.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,query))
+$(eval $(call gb_Jar_Jar,query,SRCDIR))
$(eval $(call gb_Jar_add_jars,query,\
$(OUTDIR)/bin/ridl.jar \
diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
index 2d80096..bc563b1 100644
--- a/wizards/Jar_report.mk
+++ b/wizards/Jar_report.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,report))
+$(eval $(call gb_Jar_Jar,report,SRCDIR))
$(eval $(call gb_Jar_add_jars,report,\
$(OUTDIR)/bin/ridl.jar \
diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk
index a26f5ba..6eb02ea 100644
--- a/wizards/Jar_reportbuilder.mk
+++ b/wizards/Jar_reportbuilder.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,reportbuilderwizard))
+$(eval $(call gb_Jar_Jar,reportbuilderwizard,SRCDIR))
$(eval $(call gb_Jar_add_jars,reportbuilderwizard,\
$(OUTDIR)/bin/ridl.jar \
diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk
index 8760e6c..b9204f8 100644
--- a/wizards/Jar_table.mk
+++ b/wizards/Jar_table.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,table))
+$(eval $(call gb_Jar_Jar,table,SRCDIR))
$(eval $(call gb_Jar_add_jars,table,\
$(OUTDIR)/bin/ridl.jar \
diff --git a/wizards/Jar_web.mk b/wizards/Jar_web.mk
index 5fe3b24..3d1cee8 100644
--- a/wizards/Jar_web.mk
+++ b/wizards/Jar_web.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,web))
+$(eval $(call gb_Jar_Jar,web,SRCDIR))
$(eval $(call gb_Jar_add_jars,web,\
$(OUTDIR)/bin/ridl.jar \
commit 852bd223ffa2e70328187e6ddf2234d79682d839
Author: Mathias Bauer <mba at openoffice.org>
Date: Fri Feb 25 19:21:10 2011 +0100
CWS gnumake4: remove annoying dependency of sfx2 on setup_native [hg:be9aeca025a2]
diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst
index 00d7a0c..df94edb 100644
--- a/setup_native/prj/build.lst
+++ b/setup_native/prj/build.lst
@@ -1,4 +1,4 @@
-pk setup_native : L10N:l10n l10ntools soltools sal xml2cmp NULL
+pk setup_native : L10N:l10n l10ntools soltools sal sfx2 xml2cmp NULL
pk setup_native usr1 - all sn_mkout NULL
pk setup_native\scripts\source nmake - u sn_source NULL
pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 6aa6460..3a5b800 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -59,5 +59,3 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so
-..\inc\setup_native\qswin32.h %_DEST%\inc%_EXT%\setup_native\qswin32.h
-
diff --git a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
index e1a0736..9c0fe0e 100644
--- a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
@@ -26,7 +26,7 @@
************************************************************************/
#include "quickstarter.hxx"
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
{
commit bbf3e41cd16042f533f5e82e68b3dfdb04285673
Author: Mathias Bauer <mba at openoffice.org>
Date: Thu Feb 24 17:08:10 2011 +0100
CWS gnumake4: convert linguistic to new build system
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index e486927..b204402 100755
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -114,17 +114,17 @@ Hyphenator::~Hyphenator()
if (aDicts) delete[] aDicts;
aDicts = NULL;
numdict = 0;
+ delete pPropHelper;
}
-PropertyHelper_Hyphen & Hyphenator::GetPropHelper_Impl()
+PropertyHelper_Hyphenation& Hyphenator::GetPropHelper_Impl()
{
if (!pPropHelper)
{
Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY );
- pPropHelper = new PropertyHelper_Hyphen ((XHyphenator *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Hyphenation ((XHyphenator *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
return *pPropHelper;
@@ -293,7 +293,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUStri
char *lcword;
int k = 0;
- PropertyHelper_Hyphen & rHelper = GetPropHelper();
+ PropertyHelper_Hyphenation& rHelper = GetPropHelper();
rHelper.SetTmpPropVals(aProperties);
sal_Int16 minTrail = rHelper.GetMinTrailing();
sal_Int16 minLead = rHelper.GetMinLeading();
@@ -506,13 +506,13 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUStri
sal_Int16 nPos = (sal_Int16) ((nHyphenationPosAltHyph < nHyphenationPos) ?
nHyphenationPosAltHyph : nHyphenationPos);
// dicretionary hyphenation
- xRes = new HyphenatedWord( aWord, LocaleToLanguage( aLocale ), nPos,
+ xRes = HyphenatedWord::CreateHyphenatedWord( aWord, LocaleToLanguage( aLocale ), nPos,
aWord.replaceAt(nHyphenationPosAlt + 1, cut[nHyphenationPos], repHyph),
(sal_Int16) nHyphenationPosAltHyph);
}
else
{
- xRes = new HyphenatedWord( aWord, LocaleToLanguage( aLocale ),
+ xRes = HyphenatedWord::CreateHyphenatedWord( aWord, LocaleToLanguage( aLocale ),
(sal_Int16)nHyphenationPos, aWord, (sal_Int16) nHyphenationPos);
}
}
@@ -558,7 +558,7 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const
char *lcword;
int k;
- PropertyHelper_Hyphen & rHelper = GetPropHelper();
+ PropertyHelper_Hyphenation& rHelper = GetPropHelper();
rHelper.SetTmpPropVals(aProperties);
sal_Int16 minTrail = rHelper.GetMinTrailing();
sal_Int16 minLead = rHelper.GetMinLeading();
@@ -715,7 +715,7 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const
//fprintf(stderr,"result is %s\n",OU2A(hyphenatedWord));
//fflush(stderr);
- xRes = new PossibleHyphens( aWord, LocaleToLanguage( aLocale ),
+ xRes = PossibleHyphens::CreatePossibleHyphens( aWord, LocaleToLanguage( aLocale ),
hyphenatedWord, aHyphPos );
delete[] hyphens;
@@ -826,7 +826,6 @@ sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener(
sal_Bool bRes = sal_False;
if (!bDisposing && rxLstnr.is())
{
- DBG_ASSERT( xPropHelper.is(), "xPropHelper non existent" );
bRes = GetPropHelper().removeLinguServiceEventListener( rxLstnr );
}
return bRes;
@@ -859,8 +858,7 @@ void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments )
//! And the reference to the UNO-functions while increasing
//! the ref-count and will implicitly free the memory
//! when the object is not longer used.
- pPropHelper = new PropertyHelper_Hyphen( (XHyphenator *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Hyphenation( (XHyphenator *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
else
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
index 92511ca..48178df 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
@@ -87,17 +87,16 @@ class Hyphenator :
sal_Int32 numdict;
::cppu::OInterfaceContainerHelper aEvtListeners;
- Reference< XPropertyChangeListener > xPropHelper;
Reference< XMultiServiceFactory > rSMgr;
- linguistic::PropertyHelper_Hyphen * pPropHelper;
+ linguistic::PropertyHelper_Hyphenation* pPropHelper;
sal_Bool bDisposing;
// disallow copy-constructor and assignment-operator for now
Hyphenator(const Hyphenator &);
Hyphenator & operator = (const Hyphenator &);
- linguistic::PropertyHelper_Hyphen & GetPropHelper_Impl();
- linguistic::PropertyHelper_Hyphen & GetPropHelper()
+ linguistic::PropertyHelper_Hyphenation& GetPropHelper_Impl();
+ linguistic::PropertyHelper_Hyphenation& GetPropHelper()
{
return pPropHelper ? *pPropHelper : GetPropHelper_Impl();
}
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index f4ffaea..f00f005 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -106,17 +106,17 @@ SpellChecker::~SpellChecker()
aDNames = NULL;
if (pPropHelper)
pPropHelper->RemoveAsPropListener();
+ delete pPropHelper;
}
-PropertyHelper_Spell & SpellChecker::GetPropHelper_Impl()
+PropertyHelper_Spelling & SpellChecker::GetPropHelper_Impl()
{
if (!pPropHelper)
{
Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY );
- pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Spelling( (XSpellChecker *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
return *pPropHelper;
@@ -386,7 +386,7 @@ sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rL
// You'll probably like to use a simplier solution than the provided
// one using the PropertyHelper_Spell.
- PropertyHelper_Spell &rHelper = GetPropHelper();
+ PropertyHelper_Spelling& rHelper = GetPropHelper();
rHelper.SetTmpPropVals( rProperties );
sal_Int16 nFailure = GetSpellFailure( rWord, rLocale );
@@ -475,12 +475,8 @@ Reference< XSpellAlternatives >
}
// now return an empty alternative for no suggestions or the list of alternatives if some found
- SpellAlternatives *pAlt = new SpellAlternatives;
String aTmp(rWord);
- pAlt->SetWordLanguage( aTmp, nLang );
- pAlt->SetFailureType( SpellFailure::SPELLING_ERROR );
- pAlt->SetAlternatives( aStr );
- xRes = pAlt;
+ xRes = SpellAlternatives::CreateSpellAlternatives( aTmp, nLang, SpellFailure::SPELLING_ERROR, aStr );
return xRes;
}
return xRes;
@@ -547,7 +543,6 @@ sal_Bool SAL_CALL SpellChecker::removeLinguServiceEventListener(
sal_Bool bRes = sal_False;
if (!bDisposing && rxLstnr.is())
{
- DBG_ASSERT( xPropHelper.is(), "xPropHelper non existent" );
bRes = GetPropHelper().removeLinguServiceEventListener( rxLstnr );
}
return bRes;
@@ -580,8 +575,7 @@ void SAL_CALL SpellChecker::initialize( const Sequence< Any >& rArguments )
//! And the reference to the UNO-functions while increasing
//! the ref-count and will implicitly free the memory
//! when the object is not longer used.
- pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Spelling( (XSpellChecker *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
else
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 1f6224a..530e4e3 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -76,16 +76,15 @@ class SpellChecker :
sal_Int32 numdict;
::cppu::OInterfaceContainerHelper aEvtListeners;
- Reference< XPropertyChangeListener > xPropHelper;
- linguistic::PropertyHelper_Spell * pPropHelper;
+ linguistic::PropertyHelper_Spelling* pPropHelper;
sal_Bool bDisposing;
// disallow copy-constructor and assignment-operator for now
SpellChecker(const SpellChecker &);
SpellChecker & operator = (const SpellChecker &);
- linguistic::PropertyHelper_Spell & GetPropHelper_Impl();
- linguistic::PropertyHelper_Spell & GetPropHelper()
+ linguistic::PropertyHelper_Spelling& GetPropHelper_Impl();
+ linguistic::PropertyHelper_Spelling& GetPropHelper()
{
return pPropHelper ? *pPropHelper : GetPropHelper_Impl();
}
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 75c921f..65aa7e2 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -137,17 +137,17 @@ Thesaurus::~Thesaurus()
if (pPropHelper)
pPropHelper->RemoveAsPropListener();
+ delete pPropHelper;
}
-PropertyHelper_Thes & Thesaurus::GetPropHelper_Impl()
+PropertyHelper_Thesaurus& Thesaurus::GetPropHelper_Impl()
{
if (!pPropHelper)
{
Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY );
- pPropHelper = new PropertyHelper_Thes( (XThesaurus *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Thesaurus( (XThesaurus *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
return *pPropHelper;
@@ -342,7 +342,7 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes
mentry * pmean = NULL;
sal_Int32 nmean = 0;
- PropertyHelper_Thes &rHelper = GetPropHelper();
+ PropertyHelper_Thesaurus &rHelper = GetPropHelper();
rHelper.SetTmpPropVals( rProperties );
MyThes * pTH = NULL;
@@ -601,8 +601,7 @@ void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments )
//! And the reference to the UNO-functions while increasing
//! the ref-count and will implicitly free the memory
//! when the object is not longer used.
- pPropHelper = new PropertyHelper_Thes( (XThesaurus *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Thesaurus( (XThesaurus *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
else
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index 0028e36..fc24fc8 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -85,8 +85,7 @@ class Thesaurus :
Sequence< Locale > aSuppLocales;
::cppu::OInterfaceContainerHelper aEvtListeners;
- Reference< XPropertyChangeListener > xPropHelper;
- linguistic::PropertyHelper_Thes * pPropHelper;
+ linguistic::PropertyHelper_Thesaurus* pPropHelper;
sal_Bool bDisposing;
CharClass ** aCharSetInfo;
MyThes ** aThes;
@@ -104,8 +103,8 @@ class Thesaurus :
Thesaurus(const Thesaurus &);
Thesaurus & operator = (const Thesaurus &);
- linguistic::PropertyHelper_Thes & GetPropHelper_Impl();
- linguistic::PropertyHelper_Thes & GetPropHelper()
+ linguistic::PropertyHelper_Thesaurus& GetPropHelper_Impl();
+ linguistic::PropertyHelper_Thesaurus& GetPropHelper()
{
return pPropHelper ? *pPropHelper : GetPropHelper_Impl();
}
commit cc7e35d5279daa6887246c4909faec647682d4f7
Author: Mathias Bauer <mba at openoffice.org>
Date: Tue Feb 22 14:10:09 2011 +0100
CWS gnumake4: fix for case sensitive file systems
diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk
index 956f554..a26f5ba 100644
--- a/wizards/Jar_reportbuilder.mk
+++ b/wizards/Jar_reportbuilder.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Jar_add_jars,reportbuilderwizard,\
$(eval $(call gb_Jar_set_packageroot,reportbuilderwizard,com))
-$(eval $(call gb_Jar_set_manifest,reportbuilderwizard,$(SRCDIR)/wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF))
+$(eval $(call gb_Jar_set_manifest,reportbuilderwizard,$(SRCDIR)/wizards/com/sun/star/wizards/reportbuilder/Manifest.mf))
$(eval $(call gb_Jar_set_jarclasspath,reportbuilderwizard,\
commonwizards.jar \
commit 6d5acd44fab957240d85c7629e4d8adab74b737a
Author: Mathias Bauer <mba at openoffice.org>
Date: Tue Feb 22 09:53:58 2011 +0100
CWS gnumake4: convert wizards to new build system
diff --git a/wizards/AllLangResTarget_cal.mk b/wizards/AllLangResTarget_cal.mk
new file mode 100644
index 0000000..75a525a
--- /dev/null
+++ b/wizards/AllLangResTarget_cal.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,cal))
+
+$(eval $(call gb_AllLangResTarget_add_srs,cal,\
+ cal/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,cal/res))
+
+$(eval $(call gb_SrsTarget_set_include,cal/res,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,cal/res,\
+ wizards/source/schedule/schedule.src \
+))
+
+
diff --git a/wizards/AllLangResTarget_dbw.mk b/wizards/AllLangResTarget_dbw.mk
new file mode 100644
index 0000000..2e7f3a1
--- /dev/null
+++ b/wizards/AllLangResTarget_dbw.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbw))
+
+$(eval $(call gb_AllLangResTarget_add_srs,dbw,\
+ dbw/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbw/res))
+
+$(eval $(call gb_SrsTarget_set_include,dbw/res,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbw/res,\
+ wizards/source/formwizard/dbwizres.src \
+))
+
+
diff --git a/wizards/AllLangResTarget_eur.mk b/wizards/AllLangResTarget_eur.mk
new file mode 100644
index 0000000..6efe8bf
--- /dev/null
+++ b/wizards/AllLangResTarget_eur.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,eur))
+
+$(eval $(call gb_AllLangResTarget_add_srs,eur,\
+ eur/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,eur/res))
+
+$(eval $(call gb_SrsTarget_set_include,eur/res,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,eur/res,\
+ wizards/source/euro/euro.src \
+))
+
+
diff --git a/wizards/AllLangResTarget_imp.mk b/wizards/AllLangResTarget_imp.mk
new file mode 100644
index 0000000..b671b93
--- /dev/null
+++ b/wizards/AllLangResTarget_imp.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,imp))
+
+$(eval $(call gb_AllLangResTarget_add_srs,imp,\
+ imp/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,imp/res))
+
+$(eval $(call gb_SrsTarget_set_include,imp/res,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,imp/res,\
+ wizards/source/importwizard/importwi.src \
+))
+
+
diff --git a/wizards/AllLangResTarget_tpl.mk b/wizards/AllLangResTarget_tpl.mk
new file mode 100644
index 0000000..a6f6068
--- /dev/null
+++ b/wizards/AllLangResTarget_tpl.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,tpl))
+
+$(eval $(call gb_AllLangResTarget_add_srs,tpl,\
+ tpl/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,tpl/res))
+
+$(eval $(call gb_SrsTarget_set_include,tpl/res,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,tpl/res,\
+ wizards/source/template/template.src \
+))
+
+
diff --git a/wizards/AllLangResTarget_wwz.mk b/wizards/AllLangResTarget_wwz.mk
new file mode 100644
index 0000000..c62bf40
--- /dev/null
+++ b/wizards/AllLangResTarget_wwz.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,wwz))
+
+$(eval $(call gb_AllLangResTarget_add_srs,wwz,\
+ wwz/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,wwz/res))
+
+$(eval $(call gb_SrsTarget_set_include,wwz/res,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,wwz/res,\
+ wizards/source/webwizard/webwizar.src \
+))
+
+
diff --git a/wizards/AllLangResTarget_wzi.mk b/wizards/AllLangResTarget_wzi.mk
new file mode 100644
index 0000000..fe6da01
--- /dev/null
+++ b/wizards/AllLangResTarget_wzi.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,wzi))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,wzi,wizards))
+
+$(eval $(call gb_AllLangResTarget_add_srs,wzi,\
+ wzi/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,wzi/res))
+
+$(eval $(call gb_SrsTarget_set_include,wzi/res,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,wzi/res,\
+ wizards/source/imagelists/imagelists.src \
+))
+
+
diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk
new file mode 100644
index 0000000..d18b3eb
--- /dev/null
+++ b/wizards/Jar_agenda.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,agenda))
+
+$(eval $(call gb_Jar_add_jars,agenda,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,agenda,\
+ commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,agenda,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,agenda,\
+ wizards/com/sun/star/wizards/agenda/AgendaTemplate \
+ wizards/com/sun/star/wizards/agenda/AgendaWizardDialog \
+ wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst \
+ wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl \
+ wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources \
+ wizards/com/sun/star/wizards/agenda/CallWizard \
+ wizards/com/sun/star/wizards/agenda/CGAgenda \
+ wizards/com/sun/star/wizards/agenda/CGTopic \
+ wizards/com/sun/star/wizards/agenda/TemplateConsts \
+ wizards/com/sun/star/wizards/agenda/TopicsControl \
+))
+
+$(eval $(call gb_Jar_set_componentfile,agenda,wizards/com/sun/star/wizards/agenda/agenda,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
new file mode 100644
index 0000000..5d5d18d
--- /dev/null
+++ b/wizards/Jar_commonwizards.mk
@@ -0,0 +1,132 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,commonwizards))
+
+$(eval $(call gb_Jar_add_jars,commonwizards,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,commonwizards,com))
+
+$(eval $(call gb_Jar_set_manifest,commonwizards,$(SRCDIR)/wizards/com/sun/star/wizards/common/MANIFEST.MF))
+
+$(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
+ wizards/com/sun/star/wizards/common/HelpIds \
+ wizards/com/sun/star/wizards/common/Desktop \
+ wizards/com/sun/star/wizards/common/NumberFormatter \
+ wizards/com/sun/star/wizards/common/FileAccess \
+ wizards/com/sun/star/wizards/common/Helper \
+ wizards/com/sun/star/wizards/common/InvalidQueryException \
+ wizards/com/sun/star/wizards/common/JavaTools \
+ wizards/com/sun/star/wizards/common/NoValidPathException \
+ wizards/com/sun/star/wizards/common/Properties \
+ wizards/com/sun/star/wizards/common/PropertyNames \
+ wizards/com/sun/star/wizards/common/Resource \
+ wizards/com/sun/star/wizards/common/SystemDialog \
+ wizards/com/sun/star/wizards/common/Configuration \
+ wizards/com/sun/star/wizards/common/ConfigNode \
+ wizards/com/sun/star/wizards/common/ConfigGroup \
+ wizards/com/sun/star/wizards/common/ConfigSet \
+ wizards/com/sun/star/wizards/common/XMLProvider \
+ wizards/com/sun/star/wizards/common/XMLHelper \
+ wizards/com/sun/star/wizards/common/IRenderer \
+ wizards/com/sun/star/wizards/common/Indexable \
+ wizards/com/sun/star/wizards/common/TerminateWizardException \
+ wizards/com/sun/star/wizards/common/UCB \
+ wizards/com/sun/star/wizards/common/DebugHelper \
+ wizards/com/sun/star/wizards/common/PropertySetHelper \
+ wizards/com/sun/star/wizards/common/NumericalHelper \
+ wizards/com/sun/star/wizards/common/NamedValueCollection \
+ wizards/com/sun/star/wizards/db/DBMetaData \
+ wizards/com/sun/star/wizards/db/CommandMetaData \
+ wizards/com/sun/star/wizards/db/QueryMetaData \
+ wizards/com/sun/star/wizards/db/BlindtextCreator \
+ wizards/com/sun/star/wizards/db/FieldColumn \
+ wizards/com/sun/star/wizards/db/CommandName \
+ wizards/com/sun/star/wizards/db/RecordParser \
+ wizards/com/sun/star/wizards/db/TypeInspector \
+ wizards/com/sun/star/wizards/db/ColumnPropertySet \
+ wizards/com/sun/star/wizards/db/RelationController \
+ wizards/com/sun/star/wizards/db/TableDescriptor \
+ wizards/com/sun/star/wizards/db/SQLQueryComposer \
+ wizards/com/sun/star/wizards/db/DatabaseObjectWizard \
+ wizards/com/sun/star/wizards/ui/event/AbstractListener \
+ wizards/com/sun/star/wizards/ui/event/CommonListener \
+ wizards/com/sun/star/wizards/ui/event/DataAware \
+ wizards/com/sun/star/wizards/ui/event/DataAwareFields \
+ wizards/com/sun/star/wizards/ui/event/EventNames \
+ wizards/com/sun/star/wizards/ui/event/ListModelBinder \
+ wizards/com/sun/star/wizards/ui/event/MethodInvocation \
+ wizards/com/sun/star/wizards/ui/event/RadioDataAware \
+ wizards/com/sun/star/wizards/ui/event/SimpleDataAware \
+ wizards/com/sun/star/wizards/ui/event/Task \
+ wizards/com/sun/star/wizards/ui/event/TaskEvent \
+ wizards/com/sun/star/wizards/ui/event/TaskListener \
+ wizards/com/sun/star/wizards/ui/event/UnoDataAware \
+ wizards/com/sun/star/wizards/ui/AggregateComponent \
+ wizards/com/sun/star/wizards/ui/CommandFieldSelection \
+ wizards/com/sun/star/wizards/ui/ControlScroller \
+ wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection \
+ wizards/com/sun/star/wizards/ui/DocumentPreview \
+ wizards/com/sun/star/wizards/ui/FilterComponent \
+ wizards/com/sun/star/wizards/ui/FieldSelection \
+ wizards/com/sun/star/wizards/ui/ImageList \
+ wizards/com/sun/star/wizards/ui/ButtonList \
+ wizards/com/sun/star/wizards/ui/PathSelection \
+ wizards/com/sun/star/wizards/ui/PeerConfig \
+ wizards/com/sun/star/wizards/ui/SortingComponent \
+ wizards/com/sun/star/wizards/ui/TitlesComponent \
+ wizards/com/sun/star/wizards/ui/WizardDialog \
+ wizards/com/sun/star/wizards/ui/UIConsts \
+ wizards/com/sun/star/wizards/ui/UnoDialog \
+ wizards/com/sun/star/wizards/ui/UnoDialog2 \
+ wizards/com/sun/star/wizards/ui/XCommandSelectionListener \
+ wizards/com/sun/star/wizards/ui/XFieldSelectionListener \
+ wizards/com/sun/star/wizards/ui/XPathSelectionListener \
+ wizards/com/sun/star/wizards/ui/XCompletion \
+ wizards/com/sun/star/wizards/document/Control \
+ wizards/com/sun/star/wizards/document/DatabaseControl \
+ wizards/com/sun/star/wizards/document/FormHandler \
+ wizards/com/sun/star/wizards/document/GridControl \
+ wizards/com/sun/star/wizards/document/OfficeDocument \
+ wizards/com/sun/star/wizards/document/Shape \
+ wizards/com/sun/star/wizards/document/TimeStampControl \
+ wizards/com/sun/star/wizards/text/TextDocument \
+ wizards/com/sun/star/wizards/text/TextFieldHandler \
+ wizards/com/sun/star/wizards/text/TextFrameHandler \
+ wizards/com/sun/star/wizards/text/TextSectionHandler \
+ wizards/com/sun/star/wizards/text/TextStyleHandler \
+ wizards/com/sun/star/wizards/text/TextTableHandler \
+ wizards/com/sun/star/wizards/text/ViewHandler \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_fax.mk b/wizards/Jar_fax.mk
new file mode 100644
index 0000000..9177edc
--- /dev/null
+++ b/wizards/Jar_fax.mk
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,fax))
+
+$(eval $(call gb_Jar_add_jars,fax,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,fax,com))
+
+$(eval $(call gb_Jar_set_manifest,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,fax,\
+ commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,fax,\
+ wizards/com/sun/star/wizards/fax/CallWizard \
+ wizards/com/sun/star/wizards/fax/CGFax \
+ wizards/com/sun/star/wizards/fax/CGFaxWizard \
+ wizards/com/sun/star/wizards/fax/FaxDocument \
+ wizards/com/sun/star/wizards/fax/FaxWizardDialog \
+ wizards/com/sun/star/wizards/fax/FaxWizardDialogConst \
+ wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl \
+ wizards/com/sun/star/wizards/fax/FaxWizardDialogResources \
+))
+
+$(eval $(call gb_Jar_set_componentfile,fax,wizards/com/sun/star/wizards/fax/fax,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk
new file mode 100644
index 0000000..fca7011
--- /dev/null
+++ b/wizards/Jar_form.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,form))
+
+$(eval $(call gb_Jar_add_jars,form,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,form,$(SRCDIR)/wizards/com/sun/star/wizards/form/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_packageroot,form,com))
+
+$(eval $(call gb_Jar_set_jarclasspath,form,\
+ commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,form,\
+ wizards/com/sun/star/wizards/form/CallFormWizard \
+ wizards/com/sun/star/wizards/form/DataEntrySetter \
+ wizards/com/sun/star/wizards/form/FieldLinker \
+ wizards/com/sun/star/wizards/form/Finalizer \
+ wizards/com/sun/star/wizards/form/FormConfiguration \
+ wizards/com/sun/star/wizards/form/FormControlArranger \
+ wizards/com/sun/star/wizards/form/FormDocument \
+ wizards/com/sun/star/wizards/form/FormWizard \
+ wizards/com/sun/star/wizards/form/StyleApplier \
+ wizards/com/sun/star/wizards/form/UIControlArranger \
+))
+
+$(eval $(call gb_Jar_set_componentfile,form,wizards/com/sun/star/wizards/form/form,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_letter.mk b/wizards/Jar_letter.mk
new file mode 100644
index 0000000..925d487
--- /dev/null
+++ b/wizards/Jar_letter.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,letter))
+
+$(eval $(call gb_Jar_add_jars,letter,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,letter,$(SRCDIR)/wizards/com/sun/star/wizards/letter/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_packageroot,letter,com))
+
+$(eval $(call gb_Jar_set_jarclasspath,letter,\
+ commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,letter,\
+ wizards/com/sun/star/wizards/letter/CallWizard \
+ wizards/com/sun/star/wizards/letter/CGLetter \
+ wizards/com/sun/star/wizards/letter/CGLetterWizard \
+ wizards/com/sun/star/wizards/letter/CGPaperElementLocation \
+ wizards/com/sun/star/wizards/letter/LetterDocument \
+ wizards/com/sun/star/wizards/letter/LetterWizardDialog \
+ wizards/com/sun/star/wizards/letter/LetterWizardDialogConst \
+ wizards/com/sun/star/wizards/letter/LetterWizardDialogEvents \
+ wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl \
+ wizards/com/sun/star/wizards/letter/LetterWizardDialogResources \
+ wizards/com/sun/star/wizards/letter/LocaleCodes \
+))
+
+$(eval $(call gb_Jar_set_componentfile,letter,wizards/com/sun/star/wizards/letter/letter,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk
new file mode 100644
index 0000000..0c8d26f
--- /dev/null
+++ b/wizards/Jar_query.mk
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,query))
+
+$(eval $(call gb_Jar_add_jars,query,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,query,$(SRCDIR)/wizards/com/sun/star/wizards/query/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_packageroot,query,com))
+
+$(eval $(call gb_Jar_set_jarclasspath,query,\
+ commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,query,\
+ wizards/com/sun/star/wizards/query/CallQueryWizard \
+ wizards/com/sun/star/wizards/query/Finalizer \
+ wizards/com/sun/star/wizards/query/QuerySummary \
+ wizards/com/sun/star/wizards/query/QueryWizard \
+))
+
+$(eval $(call gb_Jar_set_componentfile,query,wizards/com/sun/star/wizards/query/query,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
new file mode 100644
index 0000000..2d80096
--- /dev/null
+++ b/wizards/Jar_report.mk
@@ -0,0 +1,66 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,report))
+
+$(eval $(call gb_Jar_add_jars,report,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,report,$(SRCDIR)/wizards/com/sun/star/wizards/report/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_packageroot,report,com))
+
+$(eval $(call gb_Jar_set_jarclasspath,report,\
+ commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,report,\
+ wizards/com/sun/star/wizards/report/CallReportWizard \
+ wizards/com/sun/star/wizards/report/Dataimport \
+ wizards/com/sun/star/wizards/report/DBColumn \
+ wizards/com/sun/star/wizards/report/GroupFieldHandler \
+ wizards/com/sun/star/wizards/report/IReportBuilderLayouter \
+ wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess \
+ wizards/com/sun/star/wizards/report/IReportDocument \
+ wizards/com/sun/star/wizards/report/RecordTable \
+ wizards/com/sun/star/wizards/report/ReportFinalizer \
+ wizards/com/sun/star/wizards/report/ReportImplementationHelper \
+ wizards/com/sun/star/wizards/report/ReportLayouter \
+ wizards/com/sun/star/wizards/report/ReportTextDocument \
+ wizards/com/sun/star/wizards/report/ReportTextImplementation \
+ wizards/com/sun/star/wizards/report/ReportWizard \
+))
+
+$(eval $(call gb_Jar_set_componentfile,report,wizards/com/sun/star/wizards/report/report,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk
new file mode 100644
index 0000000..956f554
--- /dev/null
+++ b/wizards/Jar_reportbuilder.mk
@@ -0,0 +1,66 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,reportbuilderwizard))
+
+$(eval $(call gb_Jar_add_jars,reportbuilderwizard,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/commonwizards.jar \
+ $(OUTDIR)/bin/report.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,reportbuilderwizard,com))
+
+$(eval $(call gb_Jar_set_manifest,reportbuilderwizard,$(SRCDIR)/wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,reportbuilderwizard,\
+ commonwizards.jar \
+ report.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,reportbuilderwizard,\
+ wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation \
+ wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn \
+ wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns \
+ wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns \
+ wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate \
+ wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove \
+ wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft \
+ wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants \
+ wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter \
+ wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject \
+ wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel \
+ wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject \
+ wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField \
+ wizards/com/sun/star/wizards/reportbuilder/layout/Tabular \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk
new file mode 100644
index 0000000..8760e6c
--- /dev/null
+++ b/wizards/Jar_table.mk
@@ -0,0 +1,61 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,table))
+
+$(eval $(call gb_Jar_add_jars,table,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,table,com))
+
+$(eval $(call gb_Jar_set_manifest,table,$(SRCDIR)/wizards/com/sun/star/wizards/table/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,table,\
+ commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,table,\
+ wizards/com/sun/star/wizards/table/CallTableWizard \
+ wizards/com/sun/star/wizards/table/CGCategory \
+ wizards/com/sun/star/wizards/table/CGTable \
+ wizards/com/sun/star/wizards/table/FieldDescription \
+ wizards/com/sun/star/wizards/table/FieldFormatter \
+ wizards/com/sun/star/wizards/table/Finalizer \
+ wizards/com/sun/star/wizards/table/PrimaryKeyHandler \
+ wizards/com/sun/star/wizards/table/ScenarioSelector \
+ wizards/com/sun/star/wizards/table/TableWizard \
+))
+
+$(eval $(call gb_Jar_set_componentfile,table,wizards/com/sun/star/wizards/table/table,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_web.mk b/wizards/Jar_web.mk
new file mode 100644
index 0000000..5fe3b24
--- /dev/null
+++ b/wizards/Jar_web.mk
@@ -0,0 +1,106 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,web))
+
+$(eval $(call gb_Jar_add_jars,web,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,web,com))
+
+$(eval $(call gb_Jar_set_manifest,web,$(SRCDIR)/wizards/com/sun/star/wizards/web/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,web,\
+ commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,web,\
+ wizards/com/sun/star/wizards/web/AbstractErrorHandler \
+ wizards/com/sun/star/wizards/web/BackgroundsDialog \
+ wizards/com/sun/star/wizards/web/CallWizard \
+ wizards/com/sun/star/wizards/web/ErrorHandler \
+ wizards/com/sun/star/wizards/web/ExtensionVerifier \
+ wizards/com/sun/star/wizards/web/FTPDialog \
+ wizards/com/sun/star/wizards/web/FTPDialogResources \
+ wizards/com/sun/star/wizards/web/IconsDialog \
+ wizards/com/sun/star/wizards/web/ImageListDialog \
+ wizards/com/sun/star/wizards/web/LogTaskListener \
+ wizards/com/sun/star/wizards/web/Process \
+ wizards/com/sun/star/wizards/web/ProcessErrorHandler \
+ wizards/com/sun/star/wizards/web/ProcessErrors \
+ wizards/com/sun/star/wizards/web/ProcessStatusRenderer \
+ wizards/com/sun/star/wizards/web/StatusDialog \
+ wizards/com/sun/star/wizards/web/StylePreview \
+ wizards/com/sun/star/wizards/web/TOCPreview \
+ wizards/com/sun/star/wizards/web/WebWizard \
+ wizards/com/sun/star/wizards/web/WebWizardConst \
+ wizards/com/sun/star/wizards/web/WebWizardDialog \
+ wizards/com/sun/star/wizards/web/WebWizardDialogResources \
+ wizards/com/sun/star/wizards/web/WWD_Events \
+ wizards/com/sun/star/wizards/web/WWD_General \
+ wizards/com/sun/star/wizards/web/WWD_Startup \
+ wizards/com/sun/star/wizards/web/WWHID \
+ wizards/com/sun/star/wizards/web/data/CGArgument \
+ wizards/com/sun/star/wizards/web/data/CGContent \
+ wizards/com/sun/star/wizards/web/data/CGDesign \
+ wizards/com/sun/star/wizards/web/data/CGDocument \
+ wizards/com/sun/star/wizards/web/data/CGExporter \
+ wizards/com/sun/star/wizards/web/data/CGFilter \
+ wizards/com/sun/star/wizards/web/data/CGGeneralInfo \
+ wizards/com/sun/star/wizards/web/data/CGIconSet \
+ wizards/com/sun/star/wizards/web/data/CGImage \
+ wizards/com/sun/star/wizards/web/data/CGLayout \
+ wizards/com/sun/star/wizards/web/data/CGPublish \
+ wizards/com/sun/star/wizards/web/data/CGSession \
+ wizards/com/sun/star/wizards/web/data/CGSessionName \
+ wizards/com/sun/star/wizards/web/data/CGSettings \
+ wizards/com/sun/star/wizards/web/data/CGStyle \
+ wizards/com/sun/star/wizards/web/data/ConfigSetItem \
+ wizards/com/sun/star/wizards/web/data/TypeDetection \
+ wizards/com/sun/star/wizards/web/export/AbstractExporter \
+ wizards/com/sun/star/wizards/web/export/ConfiguredExporter \
+ wizards/com/sun/star/wizards/web/export/CopyExporter \
+ wizards/com/sun/star/wizards/web/export/Exporter \
+ wizards/com/sun/star/wizards/web/export/FilterExporter \
+ wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter \
+ wizards/com/sun/star/wizards/web/status/ErrorLog \
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list