[Libreoffice-commits] .: 64 commits - Module_tail_build.mk Repository.mk RepositoryExternal.mk RepositoryFixes.mk RepositoryModule_ooo.mk android/qa basctl/AllLangResTarget_basctl.mk dbaccess/AllLangResTarget_dbu.mk dbaccess/AllLangResTarget_dbui.mk extensions/AllLangResTarget_abp.mk extensions/AllLangResTarget_bib.mk extensions/AllLangResTarget_dbp.mk extensions/AllLangResTarget_pcr.mk extensions/AllLangResTarget_scn.mk extensions/AllLangResTarget_upd.mk extensions/AllLangResTarget_updchk.mk extensions/Configuration_updchk.mk extensions/CppunitTest_extensions_test_update.mk extensions/Executable_nsplugin.mk extensions/Executable_pluginapp.bin.mk extensions/Library_OOoSpotlightImporter.mk extensions/Library_abp.mk extensions/Library_bib.mk extensions/Library_dbp.mk extensions/Library_ldapbe2.mk extensions/Library_log.mk extensions/Library_npsoplugin.mk extensions/Library_oleautobridge.mk extensions/Library_oleautobridge2.mk extensions/Library_pcr.mk extensions/Library_pl.mk extensions/Lib rary_res.mk extensions/Library_scn.mk extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk extensions/Library_updatecheckui.mk extensions/Library_updatefeed.mk extensions/Library_updchk.mk extensions/Library_xmx.mk extensions/Module_extensions.mk extensions/Package_bib.mk extensions/Package_pcr.mk extensions/WinResTarget_activex.mk extensions/WinResTarget_npsoplugin.mk extensions/Zip_mdibundle.mk extensions/inc extensions/prj extensions/source extensions/stardiv extensions/util postprocess/packcomponents postprocess/packregistry postprocess/prj reportdesign/AllLangResTarget_rpt.mk reportdesign/AllLangResTarget_rptui.mk reportdesign/source sal/systools sc/AllLangResTarget_sc.mk scp2/source sd/AllLangResTarget_sd.mk solenv/gbuild starmath/AllLangResTarget_sm.mk sw/AllLangResTarget_sw.mk sw/source tail_build/prj vcl/unx
Michael Stahl
mst at kemper.freedesktop.org
Fri Jan 6 12:24:01 PST 2012
Module_tail_build.mk | 12
Repository.mk | 46
RepositoryExternal.mk | 22
RepositoryFixes.mk | 2
RepositoryModule_ooo.mk | 1
android/qa/simple/Makefile | 2
basctl/AllLangResTarget_basctl.mk | 2
dbaccess/AllLangResTarget_dbu.mk | 2
dbaccess/AllLangResTarget_dbui.mk | 2
extensions/AllLangResTarget_abp.mk | 48
extensions/AllLangResTarget_bib.mk | 49
extensions/AllLangResTarget_dbp.mk | 50
extensions/AllLangResTarget_pcr.mk | 56
extensions/AllLangResTarget_scn.mk | 49
extensions/AllLangResTarget_upd.mk | 41
extensions/AllLangResTarget_updchk.mk | 43
extensions/Configuration_updchk.mk | 42
extensions/CppunitTest_extensions_test_update.mk | 19
extensions/Executable_nsplugin.mk | 82
extensions/Executable_pluginapp.bin.mk | 99
extensions/Library_OOoSpotlightImporter.mk | 51
extensions/Library_abp.mk | 91
extensions/Library_bib.mk | 75
extensions/Library_dbp.mk | 77
extensions/Library_ldapbe2.mk | 86
extensions/Library_log.mk | 64
extensions/Library_npsoplugin.mk | 93
extensions/Library_oleautobridge.mk | 79
extensions/Library_oleautobridge2.mk | 87
extensions/Library_pcr.mk | 121 +
extensions/Library_pl.mk | 161 +
extensions/Library_res.mk | 56
extensions/Library_scn.mk | 73
extensions/Library_so_activex.mk | 92
extensions/Library_so_activex_x64.mk | 89
extensions/Library_updatecheckui.mk | 51
extensions/Library_updatefeed.mk | 48
extensions/Library_updchk.mk | 73
extensions/Library_xmx.mk | 54
extensions/Module_extensions.mk | 94
extensions/Package_bib.mk | 35
extensions/Package_pcr.mk | 35
extensions/WinResTarget_activex.mk | 49
extensions/WinResTarget_npsoplugin.mk | 35
extensions/Zip_mdibundle.mk | 38
extensions/inc/appsettings.hxx | 45
extensions/inc/makefile.mk | 39
extensions/prj/build.lst | 32
extensions/prj/d.lst | 55
extensions/prj/makefile.mk | 1
extensions/source/abpilot/exports.dxp | 1
extensions/source/abpilot/makefile.mk | 115
extensions/source/activex/README.txt | 33
extensions/source/activex/SOActionsApproval.cxx | 32
extensions/source/activex/SOActionsApproval.h | 83
extensions/source/activex/SOActionsApproval.rgs | 24
extensions/source/activex/SOActiveX.cxx | 1153 ++++++++++
extensions/source/activex/SOActiveX.h | 178 +
extensions/source/activex/SOActiveX.rgs | 33
extensions/source/activex/SOComWindowPeer.cxx | 31
extensions/source/activex/SOComWindowPeer.h | 136 +
extensions/source/activex/SOComWindowPeer.rgs | 23
extensions/source/activex/SODispatchInterceptor.cxx | 225 +
extensions/source/activex/SODispatchInterceptor.h | 158 +
extensions/source/activex/SODispatchInterceptor.rgs | 23
extensions/source/activex/StdAfx2.cxx | 21
extensions/source/activex/StdAfx2.h | 45
extensions/source/activex/com_uno_helper.h | 26
extensions/source/activex/example.html | 26
extensions/source/activex/main/README.txt | 33
extensions/source/activex/main/SOActionsApproval.cpp | 32
extensions/source/activex/main/SOActionsApproval.h | 83
extensions/source/activex/main/SOActionsApproval.rgs | 24
extensions/source/activex/main/SOActiveX.cpp | 1153 ----------
extensions/source/activex/main/SOActiveX.h | 178 -
extensions/source/activex/main/SOActiveX.rgs | 33
extensions/source/activex/main/SOComWindowPeer.cpp | 31
extensions/source/activex/main/SOComWindowPeer.h | 136 -
extensions/source/activex/main/SOComWindowPeer.rgs | 23
extensions/source/activex/main/SODispatchInterceptor.cpp | 225 -
extensions/source/activex/main/SODispatchInterceptor.h | 158 -
extensions/source/activex/main/SODispatchInterceptor.rgs | 23
extensions/source/activex/main/StdAfx2.cpp | 21
extensions/source/activex/main/StdAfx2.h | 45
extensions/source/activex/main/com_uno_helper.h | 26
extensions/source/activex/main/example.html | 26
extensions/source/activex/main/makefile.mk | 157 -
extensions/source/activex/main/resource.h | 28
extensions/source/activex/main/so_activex.cpp | 685 -----
extensions/source/activex/main/so_activex.def | 13
extensions/source/activex/main/so_activex.rc | 113
extensions/source/activex/msidl/makefile.mk | 62
extensions/source/activex/msidl/so_activex.idl | 210 -
extensions/source/activex/resource.h | 28
extensions/source/activex/so_activex.cxx | 685 +++++
extensions/source/activex/so_activex.def | 13
extensions/source/activex/so_activex.idl | 210 +
extensions/source/activex/so_activex.rc | 111
extensions/source/bibliography/makefile.mk | 98
extensions/source/config/ldap/exports.dxp | 1
extensions/source/config/ldap/makefile.mk | 105
extensions/source/dbpilots/makefile.mk | 111
extensions/source/logging/makefile.mk | 84
extensions/source/macosx/spotlight/makefile.mk | 99
extensions/source/nsplugin/source/exports.dxp | 16
extensions/source/nsplugin/source/exports_wnt.dxp | 18
extensions/source/nsplugin/source/makefile.mk | 164 -
extensions/source/nsplugin/source/npshell.cxx | 28
extensions/source/nsplugin/source/nsplugin.rc | 30
extensions/source/ole/makefile.mk | 132 -
extensions/source/ole/oleautobridge.uno.dxp | 2
extensions/source/ole/servreg.cxx | 3
extensions/source/plugin/aqua/makefile.mk | 63
extensions/source/plugin/aqua/sysplug.cxx | 812 -------
extensions/source/plugin/aqua/sysplug.mm | 812 +++++++
extensions/source/plugin/base/makefile.mk | 65
extensions/source/plugin/pl.component | 37
extensions/source/plugin/unx/makefile.mk | 104
extensions/source/plugin/util/makefile.mk | 110
extensions/source/plugin/util/makefile.pmk | 48
extensions/source/plugin/util/pl.component | 37
extensions/source/plugin/win/makefile.mk | 58
extensions/source/propctrlr/makefile.mk | 154 -
extensions/source/resource/exports.dxp | 1
extensions/source/resource/makefile.mk | 86
extensions/source/scanner/exports.dxp | 1
extensions/source/scanner/makefile.mk | 104
extensions/source/unoactivex/main/initwindowpeer.cxx | 87
extensions/source/update/check/Addons.xcu | 26
extensions/source/update/check/Jobs.xcu | 42
extensions/source/update/check/makefile.mk | 142 -
extensions/source/update/check/onlinecheck.cxx | 69
extensions/source/update/check/org/openoffice/Office/Addons.xcu | 26
extensions/source/update/check/org/openoffice/Office/Jobs.xcu | 42
extensions/source/update/check/transform.pl | 61
extensions/source/update/check/updatecheck.cxx | 33
extensions/source/update/check/updatecheck.hxx | 36
extensions/source/update/check/updateprotocol.hxx | 2
extensions/source/update/feed/makefile.mk | 72
extensions/source/update/ui/makefile.mk | 82
extensions/source/xmlextract/makefile.mk | 73
extensions/stardiv/fontest/fontest.idl | 111
extensions/stardiv/fontest/makefile.mk | 48
extensions/stardiv/oinstchk/makefile.mk | 47
extensions/stardiv/oinstchk/oinstchk.idl | 108
extensions/stardiv/pgp/makefile.mk | 53
extensions/util/hidother.src | 428 ---
extensions/util/makefile.mk | 39
extensions/util/makefile.pmk | 30
extensions/util/target.pmk | 35
postprocess/packcomponents/makefile.mk | 29
postprocess/packregistry/makefile.mk | 4
postprocess/prj/build.lst | 2
reportdesign/AllLangResTarget_rpt.mk | 2
reportdesign/AllLangResTarget_rptui.mk | 2
reportdesign/source/ui/dlg/CondFormat.cxx | 3
reportdesign/source/ui/dlg/DateTime.cxx | 2
reportdesign/source/ui/dlg/GroupsSorting.cxx | 6
reportdesign/source/ui/dlg/Navigator.cxx | 2
reportdesign/source/ui/dlg/PageNumber.cxx | 2
sal/systools/win32/onlineupdate/makefile.mk | 78
sal/systools/win32/onlineupdate/onlinecheck.cxx | 69
sal/systools/win32/onlineupdate/onlinecheck.dxp | 28
sc/AllLangResTarget_sc.mk | 2
scp2/source/onlineupdate/file_onlineupdate.scp | 2
scp2/source/ooo/file_library_ooo.scp | 2
scp2/source/ooo/file_resource_ooo.scp | 2
sd/AllLangResTarget_sd.mk | 2
solenv/gbuild/Configuration.mk | 5
solenv/gbuild/Library.mk | 2
solenv/gbuild/LinkTarget.mk | 14
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 2
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 14
solenv/gbuild/platform/macosx.mk | 18
starmath/AllLangResTarget_sm.mk | 2
sw/AllLangResTarget_sw.mk | 2
sw/source/core/doc/docglbl.cxx | 2
sw/source/core/doc/doclay.cxx | 28
tail_build/prj/build.lst | 2
vcl/unx/generic/printer/cupsmgr.cxx | 2
180 files changed, 6886 insertions(+), 8100 deletions(-)
New commits:
commit b1817420911296ce21d4db145e12c9cbeec9c228
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 6 21:16:06 2012 +0100
extensions: pl: link comphelper (bacfd2dc)
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 6c07b0f..cf74ce8 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -136,6 +136,7 @@ $(eval $(call gb_Library_add_linked_libs,pl,\
svl \
utl \
tl \
+ comphelper \
ucbhelper \
cppuhelper \
cppu \
commit 23dd856d3c70a63dd47ae2a09a75833267296432
Merge: 5106b38... 7e5b321...
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 6 21:09:13 2012 +0100
Merge branch 'feature/gbuild_extensions'
Conflicts:
extensions/source/ole/servreg.cxx
extensions/source/plugin/util/makefile.mk
postprocess/packcomponents/makefile.mk
postprocess/prj/build.lst
tail_build/prj/build.lst
diff --cc Module_tail_build.mk
index 3dce18d,a200d8e..4902f75
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@@ -55,11 -64,12 +64,13 @@@ $(eval $(call gb_Module_add_moduledirs,
sccomp \
scripting \
sd \
+ sfx2 \
slideshow \
starmath \
+ svx \
sw \
swext \
+ UnoControls \
unoxml \
uui \
vbahelper \
diff --cc Repository.mk
index e94a23b,37b3af0..bd7a13e
--- a/Repository.mk
+++ b/Repository.mk
@@@ -315,9 -341,9 +345,11 @@@ ifeq ($(OS),WNT
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
dnd \
dtrans \
+ fop \
+ fps \
ftransl \
+ so_activex \
+ so_activex_x64 \
sysdtrans \
))
endif
@@@ -379,20 -404,21 +412,33 @@@ $(eval $(call gb_Helper_register_librar
vclcanvas \
writerfilter_uno \
writerfilter_debug \
+ $(if $(filter $(GUIBASE),aqua), \
+ fps_aqua \
+ ) \
+ $(if $(filter $(OS),WNT), \
+ fps_odma \
+ ) \
+ $(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
+ fps_kde \
+ ) \
+ $(if $(filter $(GUIBASE)$(ENABLE_KDE4),unxTRUE), \
+ fps_kde4 \
+ ) \
))
+ ifeq ($(OS),WNT)
+ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ oleautobridge \
+ oleautobridge2 \
+ ))
+ endif
+
+ ifeq ($(WITH_LDAP),YES)
+ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ ldapbe2 \
+ ))
+ endif
+
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
binaryurp \
))
diff --cc extensions/source/ole/servreg.cxx
index c7ebaa8,1b9c02c..b6471e4
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@@ -118,7 -118,8 +118,8 @@@ extern "C" SAL_DLLPUBLIC_EXPORT void *
return pRet;
}
- extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue* libUnused)
-extern "C" sal_Bool SAL_DLLPUBLIC_EXPORT
++extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
+ component_canUnload( TimeValue* libUnused)
{
return globalModuleCount.canUnload( &globalModuleCount, libUnused);
}
diff --cc postprocess/packcomponents/makefile.mk
index 1b1714e,9b22b1c..20726df
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@@ -173,13 -171,19 +171,19 @@@ my_components +=
component/desktop/source/migration/services/migrationoo3 \
component/desktop/source/offacc/offacc \
component/desktop/source/splash/spl \
+ component/extensions/source/abpilot/abp \
+ component/extensions/source/bibliography/bib \
+ component/extensions/source/dbpilots/dbp \
+ component/extensions/source/logging/log \
+ component/extensions/source/propctrlr/pcr \
+ component/extensions/source/resource/res \
+ component/extensions/source/scanner/scn \
+ component/extensions/source/update/check/updchk.uno \
+ component/extensions/source/update/feed/updatefeed \
+ component/extensions/source/update/ui/updchk \
+ component/extensions/source/xmlextract/xmx \
- fpicker \
- fps_office \
+ component/fpicker/source/generic/fpicker \
+ component/fpicker/source/office/fps_office \
- dbp \
- log \
- pcr \
- res \
- scn \
syssh \
tvhlp1 \
ucpchelp1 \
diff --cc postprocess/prj/build.lst
index d285377,e8fd35a..47992b2
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm DESKTOP:extensions extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL
-po postprocess :: BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg remotebridges scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL
++po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
diff --cc tail_build/prj/build.lst
index b00d683,0c1f24d..2d6feca
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@@ -1,2 -1,2 +1,2 @@@
- tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
++tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr connectivity cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 5106b38a9cc64677b3fa4a0aea7450560775e78e
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 5 22:37:44 2012 +0100
sw: tweak comment translation 43b9be10
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 009855d..bc7c6a9 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -339,7 +339,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c
xDocSh->DoSaveAs( *pTmpMed );
xDocSh->DoSaveCompleted( pTmpMed );
- // We do not insert a FileLinkSection at the error
+ // do not insert a FileLinkSection in case of error
if( xDocSh->GetError() )
sFileName.Erase();
}
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index a2ae209..fb78a4f 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -319,7 +319,7 @@ void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt )
DeleteSection( pNode );
}
- // Delete the character for character-bound FlyFrames (if necessary)
+ // Delete the character for FlyFrames anchored as char (if necessary)
const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) && rAnchor.GetCntntAnchor())
{
@@ -351,11 +351,11 @@ void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt )
|*
|* SwDoc::CopyLayoutFmt()
|*
-|* Description: Copies the stated format (pSrc) to pDest and returns pDest.
+|* Copies the stated format (pSrc) to pDest and returns pDest.
|* If there's no pDest, it is created.
|* If the source format is located in another document, also copy correctly
|* in this case.
-|* The chaos::Anchor attribute's position is always set 0!
+|* The Anchor attribute's position is always set to 0!
|*
|*************************************************************************/
SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
@@ -427,7 +427,7 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
SwNodeIndex aIdx( GetNodes().GetEndOfAutotext() );
SwStartNode* pSttNd = GetNodes().MakeEmptySection( aIdx, SwFlyStartNode );
- // Set the chaos::Anchor/CntntIndex first.
+ // Set the Anchor/CntntIndex first.
// Within the copying part, we can access the values (DrawFmt in Headers and Footers)
aIdx = *pSttNd;
SwFmtCntnt aAttr( rSource.GetCntnt() );
@@ -941,7 +941,7 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
pFmt->SetFmtAttr( aAnch );
}
- // For character-bound Draws we set the attribute in the paragraph
+ // For Draws anchored as character we set the attribute in the paragraph
if ( FLY_AS_CHAR == eAnchorId )
{
xub_StrLen nStt = rRg.GetPoint()->nContent.GetIndex();
@@ -1021,7 +1021,7 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
SwPosFlyFrm *pFPos = 0;
SwFrmFmt *pFly;
- // collect all paragraph-bound
+ // collect all anchored somehow to paragraphs
for( sal_uInt16 n = 0; n < GetSpzFrmFmts()->Count(); ++n )
{
pFly = (*GetSpzFrmFmts())[ n ];
@@ -1046,8 +1046,8 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
}
}
- // No Layout or just a part, then it was the page-bound FlyFrames only if we
- // "wish" something is done completely.
+ // If we don't have a layout we can't get page anchored FlyFrames.
+ // Also, page anchored FlyFrames are only returned if no range is specified.
if( !GetCurrentViewShell() || pCmpRange ) //swmod 071108//swmod 071225
return;
@@ -1077,8 +1077,8 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
if ( !pCntntFrm )
{
// Oops! An empty page.
- // In order not to loose the whole frame (RTF) we look for the
- // last Cntnt before the page.
+ // In order not to loose the whole frame (RTF) we
+ // look for the last Cntnt before the page.
SwPageFrm *pPrv = (SwPageFrm*)pPage->GetPrev();
while ( !pCntntFrm && pPrv )
{
@@ -1162,7 +1162,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
sal_Bool bTable = sal_False; // To save some code.
- // Because we get by the TxtColl's name, we need to create the field first.
+ // Get the field first, beause we retrieve the TxtColl via the field's name
OSL_ENSURE( nId == USHRT_MAX || nId < rDoc.GetFldTypes()->Count(),
"FldType index out of bounds." );
SwFieldType *pType = (nId != USHRT_MAX) ? (*rDoc.GetFldTypes())[nId] : NULL;
@@ -1234,7 +1234,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
// Get the FlyFrame's Format and decouple the Layout.
SwFrmFmt *pOldFmt = rDoc.GetNodes()[nNdIdx]->GetFlyFmt();
- OSL_ENSURE( pOldFmt, "Couldn't find the Format's Fly." );
+ OSL_ENSURE( pOldFmt, "Couldn't find the Fly's Format." );
// #i115719#
// <title> and <description> attributes are lost when calling <DelFrms()>.
// Thus, keep them and restore them after the calling <MakeFrms()>
@@ -1883,7 +1883,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
// So the "backgorund update" should always be carried out
/* && !pStartSh->GetViewOptions()->IsFldName()*/ )
{
- // chaos::Action brackets!
+ // Action brackets!
GetUpdtFlds().SetInUpdateFlds( sal_True );
pTmpRoot->StartAllAction();
@@ -2137,7 +2137,7 @@ void SwDoc::SetAllUniqueFlyNames()
}
}
- // Found a new document, but not a page-bound Frame/DrawObjects
+ // Found a new document, but not a page anchored Frame/DrawObjects
// that are anchored to another Node.
if( bLoadedFlag )
SetLoaded( sal_True );
commit 7e5b321535977ccddc6703c0ad4e5d25af797654
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 6 19:44:33 2012 +0100
gbuild: macosx.mk: Bundles have no install_name
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 7b2517b..e693ecf 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -309,10 +309,12 @@ endef
gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
# bundle is a special kind of library that exists only on Darwin/OSX
-# set the TARGETTYPE to Bundle
+# set the TARGETTYPE to Bundle, and clear install_name(RPATH)
define gb_Library_Bundle
$(call gb_Library_Library,$(1))
$(call gb_LinkTarget_set_targettype,$(call gb_Library_get_linktargetname,$(1)),Bundle)
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \
+ RPATH :=
endef
# StaticLibrary class
commit 0dd3e081fbea5b917d4635de9b5cf15db217063c
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jan 4 21:29:11 2012 +0100
gbuild: macosx.mk: add gb_Library_Bundle
...and use it to build OOoSpotlightImporter.
This isn't particularly elegant, but then again, why the heck does dyld
have different dynamic library types in the first place?
diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk
index f8a4c3c..336cf4d 100644
--- a/extensions/Library_OOoSpotlightImporter.mk
+++ b/extensions/Library_OOoSpotlightImporter.mk
@@ -28,7 +28,7 @@
# instead of those above.
#
-$(eval $(call gb_Library_Library,OOoSpotlightImporter))
+$(eval $(call gb_Library_Bundle,OOoSpotlightImporter))
$(eval $(call gb_Library_add_objcobjects,OOoSpotlightImporter,\
extensions/source/macosx/spotlight/GetMetadataForFile \
@@ -45,8 +45,6 @@ $(eval $(call gb_Library_add_ldflags,OOoSpotlightImporter,\
-framework Foundation \
-framework CoreServices \
))
-# -bundle \
-
$(eval $(call gb_Library_use_external,OOoSpotlightImporter,zlib))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 114dd16..7b2517b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -187,6 +187,7 @@ $(call gb_Helper_abbreviate_dirs,\
DYLIB_FILE=`$(gb_MKTEMP)` && \
$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+ $(if $(filter Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(subst \d,$$,$(RPATH)) \
@@ -194,6 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) > $${DYLIB_FILE} && \
$(gb_CXX) \
$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+ $(if $(filter Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(subst \d,$$,$(RPATH)) \
@@ -214,7 +216,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Executable,$(TARGETTYPE)), \
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \
$(LAYER) $(1) &&) \
- $(if $(filter Library CppunitTest,$(TARGETTYPE)),\
+ $(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \
ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
rm -f $${DYLIB_FILE})
@@ -237,7 +239,7 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
+$(if $(filter Library Bundle CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
endef
@@ -246,6 +248,7 @@ endef
gb_Library_DEFS :=
gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
+gb_Bundle_TARGETTYPEFLAGS := -bundle
gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .dylib
@@ -305,6 +308,12 @@ endef
gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
+# bundle is a special kind of library that exists only on Darwin/OSX
+# set the TARGETTYPE to Bundle
+define gb_Library_Bundle
+$(call gb_Library_Library,$(1))
+$(call gb_LinkTarget_set_targettype,$(call gb_Library_get_linktargetname,$(1)),Bundle)
+endef
# StaticLibrary class
commit 81151f6861eeb24c356f6fb544a78e4459070bf3
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jan 4 16:02:54 2012 +0100
gbuild: macosx.mk: enable -fobjc-exceptions
Add it to gb_OBJCFLAGS, just like in old solenv/inc/unxmacx.mk.
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index bd92908..114dd16 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -84,7 +84,7 @@ endif
# (see toolkit module for a case where it is necessary to do it this way)
gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
-gb_OBJCFLAGS := -x objective-c
+gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
gb_LinkTarget_LDFLAGS := \
-Wl,-syslibroot,$(gb_SDKDIR) \
commit 381bed81e43d7fdd541115e0ab4213b0609e7ac0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Jan 4 01:50:57 2012 -0600
Hack to get OOoSpotlightImporter building: FIXME this is prolly not correct
diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk
index 639b381..f8a4c3c 100644
--- a/extensions/Library_OOoSpotlightImporter.mk
+++ b/extensions/Library_OOoSpotlightImporter.mk
@@ -44,8 +44,9 @@ $(eval $(call gb_Library_add_ldflags,OOoSpotlightImporter,\
-framework CoreFoundation \
-framework Foundation \
-framework CoreServices \
- -bundle \
))
+# -bundle \
+
$(eval $(call gb_Library_use_external,OOoSpotlightImporter,zlib))
commit ca6959e676984befb58b5510e9bdccc6d5fc4a7e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Jan 4 01:33:58 2012 -0600
add PLAINLIBS_NONE in the LAYER
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index ef82a82..bd92908 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -284,6 +284,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
commit 1c6f4e6ff73034cf312662c4bda31bccd36c966b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Jan 4 01:48:49 2012 -0600
fix dep to svx/globlmn.hrc inside of tail_build
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index 7e588d1..fee9fc0 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -54,6 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\
basctl/source/dlged/managelang.src \
))
-$(call gb_SrsTarget_get_target,basctl/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,basctl/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 15b6806..177bfa3 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -90,6 +90,6 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\
dbaccess/source/ui/inc/toolbox_tmpl.hrc \
))
-$(call gb_SrsTarget_get_target,dbaccess/dbu) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,dbaccess/dbu) : $(call gb_Package_get_target,svx_globlmn_hrc)
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index 7478fc2..f17c96c 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -92,6 +92,6 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbui,\
dbaccess/source/ui/inc/toolbox_tmpl.hrc \
))
-$(call gb_SrsTarget_get_target,dbaccess/dbui) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,dbaccess/dbui) : $(call gb_Package_get_target,svx_globlmn_hrc)
# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index 76baa19..71e2116 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -45,6 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\
reportdesign/source/core/resource/strings.src \
))
-$(call gb_SrsTarget_get_target,reportdesign/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,reportdesign/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index 23edf34..18674e0 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -54,6 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\
reportdesign/source/ui/report/report.src \
))
-$(call gb_SrsTarget_get_target,reportdesign/rptui) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,reportdesign/rptui) : $(call gb_Package_get_target,svx_globlmn_hrc)
# vim: set noet sw=4 ts=4:
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index ce5915b..5722899 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -105,6 +105,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/core/src/compiler.src \
))
-$(call gb_SrsTarget_get_target,sc/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,sc/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
# vim: set noet sw=4 ts=4:
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 25eab89..fd2225b 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -107,6 +107,6 @@ $(eval $(call gb_SrsTarget_add_templates,sd/res,\
sd/source/ui/app/toolbox2_tmpl.src \
))
-$(call gb_SrsTarget_get_target,sd/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,sd/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
# vim: set noet sw=4 ts=4:
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
index a1f31a4..3cfda79 100644
--- a/starmath/AllLangResTarget_sm.mk
+++ b/starmath/AllLangResTarget_sm.mk
@@ -48,6 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sm/res,\
starmath/source/toolbox.src \
))
-$(call gb_SrsTarget_get_target,sm/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,sm/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
# vim: set noet sw=4 ts=4:
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 43386be..5bb50ab 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -188,6 +188,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/wrtsh/wrtsh.src \
))
-$(call gb_SrsTarget_get_target,sw/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,sw/res) :| $(call gb_Package_get_target,svx_globlmn_hrc)
# vim: set noet sw=4 ts=4:
commit ec7c098a28b900110413ab97ab522686d94c3d40
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Jan 4 01:31:26 2012 -0600
afms is a dep of tail_build by virtue of ps_print now being in tail_build
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index f1ef4f8..0c1f24d 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit a8bdde191c83b3cbdd7647a46ed0701d573f886c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Jan 4 01:30:44 2012 -0600
fix sanedlg.hrc dep issue due to gbuildification of extensions
diff --git a/extensions/AllLangResTarget_san.mk b/extensions/AllLangResTarget_san.mk
deleted file mode 100644
index 2301f6c..0000000
--- a/extensions/AllLangResTarget_san.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl at redhat.com> (initial developer) ]
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,san))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,san,extensions/source/scanner))
-
-$(eval $(call gb_AllLangResTarget_add_srs,san,\
- scn/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,scn/res))
-
-$(eval $(call gb_SrsTarget_add_files,scn/res,\
- extensions/source/scanner/grid.src \
- extensions/source/scanner/sanedlg.src \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/AllLangResTarget_scn.mk b/extensions/AllLangResTarget_scn.mk
new file mode 100644
index 0000000..8b8dde4
--- /dev/null
+++ b/extensions/AllLangResTarget_scn.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl at redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,scn))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,scn,extensions/source/scanner))
+
+$(eval $(call gb_AllLangResTarget_add_srs,scn,\
+ scn/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,scn/res))
+
+$(eval $(call gb_SrsTarget_set_include,scn/res,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/extensions/source/scanner \
+))
+
+$(eval $(call gb_SrsTarget_add_files,scn/res,\
+ extensions/source/scanner/grid.src \
+ extensions/source/scanner/sanedlg.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 348b95e..62caaf6 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
AllLangResTarget_bib \
AllLangResTarget_dbp \
AllLangResTarget_pcr \
- AllLangResTarget_san \
+ AllLangResTarget_scn \
AllLangResTarget_upd \
AllLangResTarget_updchk \
Configuration_updchk \
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 6a23a9f..311dd9f 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -68,7 +68,7 @@ STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
#ifdef UNX
-STD_RES_FILE( gid_File_Res_San, san )
+STD_RES_FILE( gid_File_Res_San, scn )
#endif
commit fd6649175956c9d322fe02fd413fe6970aa6819e
Merge: 79b252a... a8feb5b...
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Dec 24 09:44:24 2011 -0500
Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions
Conflicts:
Module_tail_build.mk
Repository.mk
extensions/util/makefile.pmk
postprocess/prj/build.lst
svx/AllLangResTarget_svx.mk
diff --cc Module_tail_build.mk
index df73553,409c928..a200d8e
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@@ -25,14 -25,11 +25,15 @@@
$(eval $(call gb_Module_Module,tail_end))
$(eval $(call gb_Module_add_moduledirs,tail_end,\
+ accessibility \
animations \
+ avmedia \
basctl \
+ basic \
bean \
+ canvas \
chart2 \
+ cppcanvas \
cui \
dbaccess \
desktop \
diff --cc Repository.mk
index cbc0889,56a252d..37b3af0
--- a/Repository.mk
+++ b/Repository.mk
@@@ -92,30 -94,11 +94,31 @@@ endi
endif
+ifneq ($(WITH_MOZILLA),NO)
+$(eval $(call gb_Helper_register_executables,OOO,\
+ nspugin \
+ pluginapp.bin \
+))
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ pl \
+))
+endif # WITH_MOZILLA
+
+
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
+ OOoSpotlightImporter \
+))
+
+endif
+
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
PptImporter \
+ abp \
adabas \
adabasui \
+ acc \
agg \
analysis \
animcore \
@@@ -302,9 -280,9 +308,10 @@@ $(eval $(call gb_Helper_register_librar
localedata_es \
localedata_euro \
localedata_others \
+ log_uno \
mcnttype \
neon \
+ npsoplugin \
package2 \
reg \
scriptframe \
@@@ -316,7 -294,7 +323,8 @@@
ucb \
ucpfile \
unopkgapp \
+ updchk \
+ unsafe_uno \
xmlsecurity \
xsec_fw \
xsec_xmlsec \
diff --cc android/qa/simple/Makefile
index 0000000,ee5ad19..a98250b
mode 000000,100644..100644
--- a/android/qa/simple/Makefile
+++ b/android/qa/simple/Makefile
@@@ -1,0 -1,133 +1,133 @@@
+ # The package of this app
+ APP_PACKAGE=org.libreoffice.android.qa
+
+ # The name of the Bootstrap activity class
+ BOOTSTRAP=org.libreoffice.android.Bootstrap
+
+ # The full path the the app's directory needs to be supplied in a
+ # couple of places, unfortunately.
+
+ APP_DATA_PATH=/data/data/$(APP_PACKAGE)
+
+ NDK_HOME:=$(shell type -p ndk-build)
+ NDK_HOME:=$(shell dirname $(NDK_HOME))
+
+ SODEST=libs/armeabi-v7a
+ OBJLOCAL=obj/local/armeabi-v7a
+
+ define COPY
+ cp $(1) $(SODEST)$(if $(2),/$(2)) && \
+ arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \
+ cp $(1) $(OBJLOCAL)$(if $(2),/$(2))
+ endef
+
+ # The default target just builds.
+
+ all: build-ant
+
+ copy-stuff:
+ #
+ # Copy shared libraries we need to libs/armeabi-v7a so that ant will
+ # include them in the .apk.
+ #
+ # Copy them to obj/local/armeabi-v7a, too, where gdb will look for
+ # them.
+ #
+ mkdir -p $(SODEST) $(OBJLOCAL)
+ #
+ # First the most important one, liblo-bootstrap.so
+ $(call COPY,$(OUTDIR)/lib/liblo-bootstrap.so)
+ #
+ # Then the cppunittester "program". As all "program"
+ # files we build for Android actually is a shared object.
+ $(call COPY,$(OUTDIR)/bin/cppunit/cppunittester,libcppunittester.so)
+ #
+ # The cppunit library
+ $(call COPY,$(OUTDIR)/lib/libcppunit-1.12.so)
+ #
+ # cppunit "plug-ins", first ones from sal
+ #
+ $(call COPY,$(SRCDIR)/sal/$(INPATH)/lib/*.so)
+ #
+ # and ones from other modules. Note that depending on when you try
+ # this, these might not have been built yet.
+ #
+ for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \
+ $(call COPY,$${F},`basename $${F}`); \
+ done
+ #
+ for F in i18npool_test_breakiterator; do \
+ $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
+ done
+ #
+ # Other "programs"
+ $(call COPY,$(OUTDIR)/bin/uno,libunoexe.so)
+ #
+ # Libs and UNO components that the tests from other modules need.
+ #
+ for F in $(strip \
+ comphelpgcc3 \
+ gcc3_uno \
+ i18nisolang1gcc3 \
+ i18nutilgcc3 \
+ icudatalo \
+ icui18nlo \
+ icuuclo \
+ localedata_en \
+ localedata_others \
+ reg \
+ store \
+ ucbhelper4gcc3 \
+ uno_cppu \
+ uno_salhelpergcc3 \
+ uno_cppuhelpergcc3 \
+ unoexceptionprotector \
+ xml2 \
+ xmlreader \
+ bootstrap.uno \
+ i18npool.uno); do \
+ $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
+ done
+ #
+ # Then the shared GNU C++ library
+ $(call COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
+ #
+ # bridgetest components, not in solver
+ for F in bridgetest constructors cppobj; do \
+ $(call COPY,$(SRC_ROOT)/testtools/$(INPATH)/lib/lib$${F}.uno.so); \
+ done
+ #
+ # Then other "assets". Let the directory structure under assets mimic
+ # that under solver for now.
+ mkdir -p assets/bin assets/lib assets/xml/ure assets/ComponentTarget/i18npool/util
+ cp $(OUTDIR)/bin/udkapi.rdb assets/bin
+ cp $(OUTDIR)/bin/types.rdb assets/bin
+ cp $(OUTDIR)/xml/ure/services.rdb assets/xml/ure
+ cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util
+ for F in uno_services uno_types; do \
+ sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' <$(SRC_ROOT)/testtools/$(INPATH)/lib/$${F}.rdb >assets/lib/$${F}.rdb; \
+ done
+
+ build-ant: copy-stuff
+ unset JAVA_HOME && ant debug
+
+ install: copy-stuff
+ unset JAVA_HOME && ant debug install
+ @echo
+ @echo 'Run it with something like what "make run" does (see Makefile)'
+ @echo
+
+ run:
+ # Note: these are just examples.
+ #
+ adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e lo-main-cmdline "$(APP_DATA_PATH)/lib/libqa_sal_types.so"
+ #
+ sleep 10
- adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e lo-main-cmdline "$(APP_DATA_PATH)/lib/libtest_i18npool_test_breakiterator.so --protector libunoexceptionprotector.so unoexceptionprotector '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb' '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/ComponentTarget/i18npool/util/i18npool.component' -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib"
++ adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e lo-main-cmdline "$(APP_DATA_PATH)/lib/libtest_i18npool_test_breakiterator.so --protector libunoexceptionprotector.so unoexceptionprotector '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb' '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/ComponentTarget/i18npool/util/i18npool.component' -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib"
+ #
+ # adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libunoexe -e lo-main-cmdline "-ro /assets/lib/uno_services.rdb -ro /assets/lib/uno_types.rdb -s com.sun.star.test.bridge.BridgeTest -- com.sun.star.test.bridge.CppTestObject" -e lo-main-delay 2
+
+ clean:
+ ant clean
+ rm -rf assets $(SODEST) $(OBJLOCAL)
+
diff --cc postprocess/prj/build.lst
index 92dff0c,a372450..e8fd35a
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg psprint_config remotebridges scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL
-po postprocess :: BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg remotebridges scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL
++po postprocess :: BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg remotebridges scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
diff --cc solenv/gbuild/platform/WNT_INTEL_GCC.mk
index ac7e4be,1a6b095..ce4a269
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@@ -278,13 -271,10 +271,12 @@@ gb_Library_PLAINLIBS_NONE +=
oleaut32 \
shell32 \
shlwapi \
+ urlmon \
user32 \
uuid \
- uwinapi \
winmm \
version \
+ wininet \
winspool \
ws2_32 \
diff --cc solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 638aade,36c95f6..5f0fb2d
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@@ -296,10 -299,10 +296,10 @@@ ende
# CxxObject class
define gb_CxxObject__command
- $(call gb_Output_announce,$(2),$(true),CXX,3)
+ $(call gb_Output_announce,$(2).cxx,$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
- $(gb_CXX) \
+ $(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), $(gb_CXX)) \
$(DEFS) \
$(T_CXXFLAGS) \
-Fd$(PDBFILE) \
@@@ -356,10 -358,7 +356,9 @@@ $(call gb_Helper_abbreviate_dirs_native
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
+ $(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64, -MACHINE:IX86) \
+ $(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \
$(T_LDFLAGS) \
- $(if $(gb_PRODUCT),,-NODEFAULTLIB) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
@@@ -422,9 -422,7 +421,8 @@@ gb_Library_PLAINLIBS_NONE +=
shlwapi \
user32 \
uuid \
- uwinapi \
version \
+ wininet \
winmm \
winspool \
ws2_32 \
diff --cc vcl/unx/generic/printer/cupsmgr.cxx
index c7e9516,381478d..85c2e74
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@@ -448,18 -477,30 +477,30 @@@ void CUPSManager::runDests(
// prepare against a signal during FcInit or FcConfigGetCurrent
if( sigsetjmp( aViolationBuffer, ~0 ) == 0 )
{
- int nDests = m_pCUPSWrapper->cupsGetDests( &pDests );
- #if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "came out of cupsGetDests\n" );
- #endif
+ // n#722902 - do a fast-failing check for cups working *at
+ // all* first
+ http_t* p_http;
+ if( (p_http=m_pCUPSWrapper->httpConnectEncrypt(
- m_pCUPSWrapper->cupsServer(),
++ m_pCUPSWrapper->cupsServer(),
+ m_pCUPSWrapper->ippPort(),
+ m_pCUPSWrapper->cupsEncryption())) != NULL )
+ {
+ // neat, cups is up, clean up the canary
+ m_pCUPSWrapper->httpClose(p_http);
- osl::MutexGuard aGuard( m_aCUPSMutex );
- m_nDests = nDests;
- m_pDests = pDests;
- m_bNewDests = true;
- #if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "finished cupsGetDests\n" );
- #endif
+ int nDests = m_pCUPSWrapper->cupsGetDests( &pDests );
+ #if OSL_DEBUG_LEVEL > 1
+ fprintf( stderr, "came out of cupsGetDests\n" );
+ #endif
+
+ osl::MutexGuard aGuard( m_aCUPSMutex );
+ m_nDests = nDests;
+ m_pDests = pDests;
+ m_bNewDests = true;
+ #if OSL_DEBUG_LEVEL > 1
+ fprintf( stderr, "finished cupsGetDests\n" );
+ #endif
+ }
}
else
{
commit 79b252a56db8f1c2159d3269de415ffe2f2d9bb1
Author: Peter Foley <pefoley2 at verizon.net>
Date: Wed Dec 21 19:37:48 2011 -0500
add framework to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 764b9fc..df73553 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
filter \
forms \
formula \
+ framework \
hwpfilter \
idl \
lingucomponent \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 87ca96d..f1ef4f8 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker framework javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 489adacb7cef9a63a9326a55f5265bef937c4267
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Dec 21 16:52:30 2011 +0100
Repository.mk: for libraries it's PLAINLIBS_NONE
diff --git a/Repository.mk b/Repository.mk
index 4f2e8e6..cbc0889 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -105,7 +105,7 @@ endif # WITH_MOZILLA
ifeq ($(OS),MACOSX)
-$(eval $(call gb_Helper_register_libraries,NONE, \
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
OOoSpotlightImporter \
))
commit ba507c41ba991b72da34da58b6a5d61bc1a7822e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Dec 21 13:22:52 2011 +0100
gbuild: WNT: register wininet library
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index e8fe616..ac7e4be 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -284,6 +284,7 @@ gb_Library_PLAINLIBS_NONE += \
uwinapi \
winmm \
version \
+ wininet \
winspool \
ws2_32 \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index de562a7..638aade 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -424,6 +424,7 @@ gb_Library_PLAINLIBS_NONE += \
uuid \
uwinapi \
version \
+ wininet \
winmm \
winspool \
ws2_32 \
commit 6c6055750dd4c0ddcff06fcf5b6d93d576245633
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Dec 19 16:37:06 2011 +0100
move onlinecheck.cxx from sal to extensions
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index a16f2a2..c5286de 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -51,6 +51,11 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_linked_libs,updchk,\
ole32 \
shell32 \
+ wininet \
+))
+
+$(eval $(call gb_Library_add_exception_objects,updchk,\
+ extensions/source/update/check/onlinecheck \
))
endif # OS WNT
diff --git a/extensions/source/update/check/onlinecheck.cxx b/extensions/source/update/check/onlinecheck.cxx
new file mode 100644
index 0000000..0a76539
--- /dev/null
+++ b/extensions/source/update/check/onlinecheck.cxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 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.
+ *
+ ************************************************************************/
+
+#ifdef _MSC_VER
+#pragma warning( disable: 4668 )
+#endif
+
+#include <sal/types.h>
+#include <sal/macros.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <wininet.h>
+
+#ifdef UNICODE
+#define _UNICODE
+#endif
+#include <tchar.h>
+
+// #i71984
+extern "C" bool SAL_CALL WNT_hasInternetConnection()
+{
+ DWORD dwFlags;
+ TCHAR szConnectionName[1024];
+
+#ifndef __MINGW32__
+ __try {
+#endif
+ BOOL fIsConnected = InternetGetConnectedStateEx(
+ &dwFlags,
+ szConnectionName,
+ SAL_N_ELEMENTS(szConnectionName),
+ 0 );
+
+ return fIsConnected ? true : false;
+
+#ifndef __MINGW32__
+ } __except( EXCEPTION_EXECUTE_HANDLER ) {
+ return false;
+ }
+#endif
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 66acb88..d0b204a 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -85,6 +85,7 @@ namespace uno = com::sun::star::uno ;
#define PROPERTY_DEFAULT_TEXT UNISTRING("DefaultText")
#define PROPERTY_SHOW_MENUICON UNISTRING("MenuIconVisible")
+extern "C" bool SAL_CALL WNT_hasInternetConnection();
//------------------------------------------------------------------------------
// Returns the URL of the release note for the given position
@@ -267,9 +268,11 @@ private:
/* Used to avoid dialup login windows (on platforms we know how to double this) */
inline bool hasInternetConnection() const
{
- if(m_pHasInternetConnection != NULL )
- return (sal_True == m_pHasInternetConnection());
+#ifdef WNT
+ return WNT_hasInternetConnection();
+#else
return true;
+#endif
}
/* Creates a new instance of UpdateInformationProvider and returns this instance */
@@ -295,10 +298,6 @@ protected:
osl::Condition& m_aCondition;
private:
-
-// const
- OnlineCheckFunc m_pHasInternetConnection;
-
const uno::Reference<uno::XComponentContext> m_xContext;
uno::Reference<deployment::XUpdateInformationProvider> m_xProvider;
};
@@ -373,30 +372,8 @@ private:
UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition,
const uno::Reference<uno::XComponentContext>& xContext ) :
m_aCondition(rCondition),
- m_pHasInternetConnection(NULL),
m_xContext(xContext)
{
-
-#ifdef WNT
- rtl::OUString aPath;
- if( osl_getExecutableFile(&aPath.pData) == osl_Process_E_None )
- {
- sal_uInt32 lastIndex = aPath.lastIndexOf('/');
- if ( lastIndex > 0 )
- {
- aPath = aPath.copy( 0, lastIndex+1 );
- aPath += UNISTRING( "onlinecheck" );
- }
-
- if ( m_aModule.load(aPath) )
- {
- m_pHasInternetConnection =
- reinterpret_cast < OnlineCheckFunc > (
- m_aModule.getFunctionSymbol( UNISTRING("hasInternetConnection")));
- }
- }
-#endif
-
createSuspended();
// actually run the thread
diff --git a/sal/systools/win32/onlineupdate/makefile.mk b/sal/systools/win32/onlineupdate/makefile.mk
deleted file mode 100755
index 027ddef..0000000
--- a/sal/systools/win32/onlineupdate/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=sal
-TARGET=onlinecheck
-
-USE_DEFFILE=TRUE
-LIBTARGET=NO
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- Targets ----------------------------------
-
-.IF "$(GUI)"=="WNT"
-
-.IF "$(COMEX)"=="9"
-.IF "$(PSDK_HOME)"!=""
-# Since the 02/2003 PSDK the "new" linker is needed here.
-LINK=$(WRAPCMD) "$(PSDK_HOME)$/Bin$/Win64$/LINK.EXE"
-.ENDIF
-.ENDIF
-
-SLOFILES=\
- $(SLO)$/onlinecheck.obj
-
-
-SHL1TARGET=$(TARGET)
-SHL1IMPLIB=$(SHL1TARGET)
-SHL1DEF=$(MISC)/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=$(SHL1TARGET).dxp
-
-DEF1DEPN=\
- $(DEF1EXPORTFILE)\
- makefile.mk
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1STDLIBS=\
- $(KERNEL32LIB)\
- $(LIBCMT)\
- $(WININETLIB)
-
-
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/sal/systools/win32/onlineupdate/onlinecheck.cxx b/sal/systools/win32/onlineupdate/onlinecheck.cxx
deleted file mode 100644
index d3bbdc3..0000000
--- a/sal/systools/win32/onlineupdate/onlinecheck.cxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 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.
- *
- ************************************************************************/
-
-#ifdef _MSC_VER
-#pragma warning( disable: 4668 )
-#endif
-
-#include <sal/types.h>
-#include <sal/macros.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <wininet.h>
-
-#ifdef UNICODE
-#define _UNICODE
-#endif
-#include <tchar.h>
-
-// #i71984
-extern "C" sal_Bool SAL_CALL hasInternetConnection()
-{
- DWORD dwFlags;
- TCHAR szConnectionName[1024];
-
-#ifndef __MINGW32__
- __try {
-#endif
- BOOL fIsConnected = InternetGetConnectedStateEx(
- &dwFlags,
- szConnectionName,
- SAL_N_ELEMENTS(szConnectionName),
- 0 );
-
- return fIsConnected ? sal_True : sal_False;
-
-#ifndef __MINGW32__
- } __except( EXCEPTION_EXECUTE_HANDLER ) {
- return sal_False;
- }
-#endif
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/onlineupdate/onlinecheck.dxp b/sal/systools/win32/onlineupdate/onlinecheck.dxp
deleted file mode 100644
index 7d3a3ca..0000000
--- a/sal/systools/win32/onlineupdate/onlinecheck.dxp
+++ /dev/null
@@ -1,28 +0,0 @@
-;*************************************************************************
-;
-; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-;
-; Copyright 2000, 2010 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.
-;
-;*************************************************************************
-
-hasInternetConnection
commit 166f974c858546330fd98bd38e09c9cbfa124d82
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Dec 21 10:48:29 2011 +0100
extensions: bin unused files
diff --git a/extensions/inc/appsettings.hxx b/extensions/inc/appsettings.hxx
deleted file mode 100644
index 8622db0..0000000
--- a/extensions/inc/appsettings.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 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.
- *
- ************************************************************************/
-#ifndef _APPSETTINGS_HXX
-#define _APPSETTINGS_HXX
-
-#include <stardiv/uno/util/containr.hxx>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-XNameContainer* getApplicationSettings();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/unoactivex/main/initwindowpeer.cxx b/extensions/source/unoactivex/main/initwindowpeer.cxx
deleted file mode 100644
index f2ae4cc..0000000
--- a/extensions/source/unoactivex/main/initwindowpeer.cxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 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.
- *
- ************************************************************************/
-
-
-
-#include "initwindowpeer.hxx"
-
-using namespace ::com::sun::star;
-
-
-uno::Any SAL_CALL InitWindowPeer::getWindowHandle( const uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType )
- throw ( uno::RuntimeException )
-{
- uno::Any aRes;
- sal_Int32 nHwnd = (sal_Int32)m_hwnd;
- aRes <<= nHwnd;
- return aRes;
-}
-
-
-uno::Reference< awt::XToolkit > SAL_CALL InitWindowPeer::getToolkit()
- throw ( uno::RuntimeException )
-{
- return uno::Reference< awt::XToolkit >();
-}
-
-void SAL_CALL InitWindowPeer::setPointer( const uno::Reference< awt::XPointer >& Pointer )
- throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::setBackground( sal_Int32 Color )
- throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::invalidate( sal_Int16 Flags )
- throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::invalidateRect( const awt::Rectangle& Rect, sal_Int16 Flags )
- throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::dispose()
- throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
- throw ( uno::RuntimeException )
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/util/hidother.src b/extensions/util/hidother.src
deleted file mode 100644
index cfe1db5..0000000
--- a/extensions/util/hidother.src
+++ /dev/null
@@ -1,428 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 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.
- *
- ************************************************************************/
-
-#include "../inc/abpilot.hrc"
-#include "../inc/bibliography.hrc"
-#include "../inc/dbpilots.hrc"
-#include "../inc/propctrlr.hrc"
-#include "../inc/update.hrc"
-
-hidspecial HID_ABSPILOT { HelpId = HID_ABSPILOT; }
-hidspecial HID_ABSPILOT_CANCEL { HelpId = HID_ABSPILOT_CANCEL; }
-hidspecial HID_ABSPILOT_FINISH { HelpId = HID_ABSPILOT_FINISH; }
-hidspecial HID_ABSPILOT_NEXT { HelpId = HID_ABSPILOT_NEXT; }
-hidspecial HID_ABSPILOT_PREVIOUS { HelpId = HID_ABSPILOT_PREVIOUS; }
-
-hidspecial HID_BIB_ADDRESS_POS { HelpId = HID_BIB_ADDRESS_POS; }
-hidspecial HID_BIB_ANNOTE_POS { HelpId = HID_BIB_ANNOTE_POS; }
-hidspecial HID_BIB_AUTHORITYTYPE_POS { HelpId = HID_BIB_AUTHORITYTYPE_POS; }
-hidspecial HID_BIB_AUTHOR_POS { HelpId = HID_BIB_AUTHOR_POS; }
-hidspecial HID_BIB_BOOKTITLE_POS { HelpId = HID_BIB_BOOKTITLE_POS; }
-hidspecial HID_BIB_CHANGESOURCE { HelpId = HID_BIB_CHANGESOURCE; }
-hidspecial HID_BIB_CHAPTER_POS { HelpId = HID_BIB_CHAPTER_POS; }
-hidspecial HID_BIB_CONTROL_PAGE { HelpId = HID_BIB_CONTROL_PAGE; }
-hidspecial HID_BIB_CONTROL_PARENT { HelpId = HID_BIB_CONTROL_PARENT; }
-hidspecial HID_BIB_CUSTOM1_POS { HelpId = HID_BIB_CUSTOM1_POS; }
-hidspecial HID_BIB_CUSTOM2_POS { HelpId = HID_BIB_CUSTOM2_POS; }
-hidspecial HID_BIB_CUSTOM3_POS { HelpId = HID_BIB_CUSTOM3_POS; }
-hidspecial HID_BIB_CUSTOM4_POS { HelpId = HID_BIB_CUSTOM4_POS; }
-hidspecial HID_BIB_CUSTOM5_POS { HelpId = HID_BIB_CUSTOM5_POS; }
-hidspecial HID_BIB_DB_GRIDCTRL { HelpId = HID_BIB_DB_GRIDCTRL; }
-hidspecial HID_BIB_DB_TBX { HelpId = HID_BIB_DB_TBX; }
-hidspecial HID_BIB_DELETE_RECORD { HelpId = HID_BIB_DELETE_RECORD; }
-hidspecial HID_BIB_EDITION_POS { HelpId = HID_BIB_EDITION_POS; }
-hidspecial HID_BIB_EDITOR_POS { HelpId = HID_BIB_EDITOR_POS; }
-hidspecial HID_BIB_HOWPUBLISHED_POS { HelpId = HID_BIB_HOWPUBLISHED_POS; }
-hidspecial HID_BIB_IDENTIFIER_POS { HelpId = HID_BIB_IDENTIFIER_POS; }
-hidspecial HID_BIB_INSERT_RECORD { HelpId = HID_BIB_INSERT_RECORD; }
-hidspecial HID_BIB_INSTITUTION_POS { HelpId = HID_BIB_INSTITUTION_POS; }
-hidspecial HID_BIB_ISBN_POS { HelpId = HID_BIB_ISBN_POS; }
-hidspecial HID_BIB_JOURNAL_POS { HelpId = HID_BIB_JOURNAL_POS; }
-hidspecial HID_BIB_MAPPINGDLG { HelpId = HID_BIB_MAPPINGDLG; }
-hidspecial HID_BIB_MONTH_POS { HelpId = HID_BIB_MONTH_POS; }
-hidspecial HID_BIB_NOTE_POS { HelpId = HID_BIB_NOTE_POS; }
-hidspecial HID_BIB_NUMBER_POS { HelpId = HID_BIB_NUMBER_POS; }
-hidspecial HID_BIB_ORGANIZATIONS_POS { HelpId = HID_BIB_ORGANIZATIONS_POS; }
-hidspecial HID_BIB_PAGES_POS { HelpId = HID_BIB_PAGES_POS; }
-hidspecial HID_BIB_PUBLISHER_POS { HelpId = HID_BIB_PUBLISHER_POS; }
-hidspecial HID_BIB_REPORTTYPE_POS { HelpId = HID_BIB_REPORTTYPE_POS; }
-hidspecial HID_BIB_SCHOOL_POS { HelpId = HID_BIB_SCHOOL_POS; }
-hidspecial HID_BIB_SERIES_POS { HelpId = HID_BIB_SERIES_POS; }
-hidspecial HID_BIB_TBX_AUTOFILTER { HelpId = HID_BIB_TBX_AUTOFILTER; }
-hidspecial HID_BIB_TBX_SEARCH { HelpId = HID_BIB_TBX_SEARCH; }
-hidspecial HID_BIB_TBX_TABLE { HelpId = HID_BIB_TBX_TABLE; }
-hidspecial HID_BIB_TITLE_POS { HelpId = HID_BIB_TITLE_POS; }
-hidspecial HID_BIB_URL_POS { HelpId = HID_BIB_URL_POS; }
-hidspecial HID_BIB_VOLUME_POS { HelpId = HID_BIB_VOLUME_POS; }
-hidspecial HID_BIB_YEAR_POS { HelpId = HID_BIB_YEAR_POS; }
-
-hidspecial HID_CHECK_FOR_UPD_CANCEL { HelpId = HID_CHECK_FOR_UPD_CANCEL; }
-hidspecial HID_CHECK_FOR_UPD_CLOSE { HelpId = HID_CHECK_FOR_UPD_CLOSE; }
-hidspecial HID_CHECK_FOR_UPD_DESCRIPTION { HelpId = HID_CHECK_FOR_UPD_DESCRIPTION; }
-hidspecial HID_CHECK_FOR_UPD_DLG { HelpId = HID_CHECK_FOR_UPD_DLG; }
-hidspecial HID_CHECK_FOR_UPD_DOWNLOAD { HelpId = HID_CHECK_FOR_UPD_DOWNLOAD; }
-hidspecial HID_CHECK_FOR_UPD_DOWNLOAD2 { HelpId = HID_CHECK_FOR_UPD_DOWNLOAD2; }
-hidspecial HID_CHECK_FOR_UPD_INSTALL { HelpId = HID_CHECK_FOR_UPD_INSTALL; }
-hidspecial HID_CHECK_FOR_UPD_PAUSE { HelpId = HID_CHECK_FOR_UPD_PAUSE; }
-hidspecial HID_CHECK_FOR_UPD_RESUME { HelpId = HID_CHECK_FOR_UPD_RESUME; }
-hidspecial HID_CHECK_FOR_UPD_STATUS { HelpId = HID_CHECK_FOR_UPD_STATUS; }
-
-hidspecial HID_DLG_DBCHANGE { HelpId = HID_DLG_DBCHANGE; }
-hidspecial HID_DLG_MAPPING { HelpId = HID_DLG_MAPPING; }
-
-hidspecial HID_EVT_ACTIONPERFORMED { HelpId = HID_EVT_ACTIONPERFORMED; }
-hidspecial HID_EVT_ADJUSTMENTVALUECHANGED { HelpId = HID_EVT_ADJUSTMENTVALUECHANGED; }
-hidspecial HID_EVT_AFTERUPDATE { HelpId = HID_EVT_AFTERUPDATE; }
-hidspecial HID_EVT_APPROVEACTIONPERFORMED { HelpId = HID_EVT_APPROVEACTIONPERFORMED; }
-hidspecial HID_EVT_APPROVEPARAMETER { HelpId = HID_EVT_APPROVEPARAMETER; }
-hidspecial HID_EVT_APPROVERESETTED { HelpId = HID_EVT_APPROVERESETTED; }
-hidspecial HID_EVT_APPROVEROWCHANGE { HelpId = HID_EVT_APPROVEROWCHANGE; }
-hidspecial HID_EVT_BEFOREUPDATE { HelpId = HID_EVT_BEFOREUPDATE; }
-hidspecial HID_EVT_CHANGED { HelpId = HID_EVT_CHANGED; }
-hidspecial HID_EVT_CONFIRMDELETE { HelpId = HID_EVT_CONFIRMDELETE; }
-hidspecial HID_EVT_ERROROCCURRED { HelpId = HID_EVT_ERROROCCURRED; }
-hidspecial HID_EVT_FOCUSGAINED { HelpId = HID_EVT_FOCUSGAINED; }
-hidspecial HID_EVT_FOCUSLOST { HelpId = HID_EVT_FOCUSLOST; }
-hidspecial HID_EVT_ITEMSTATECHANGED { HelpId = HID_EVT_ITEMSTATECHANGED; }
-hidspecial HID_EVT_KEYTYPED { HelpId = HID_EVT_KEYTYPED; }
-hidspecial HID_EVT_KEYUP { HelpId = HID_EVT_KEYUP; }
-hidspecial HID_EVT_LOADED { HelpId = HID_EVT_LOADED; }
-hidspecial HID_EVT_MOUSEDRAGGED { HelpId = HID_EVT_MOUSEDRAGGED; }
-hidspecial HID_EVT_MOUSEENTERED { HelpId = HID_EVT_MOUSEENTERED; }
-hidspecial HID_EVT_MOUSEEXITED { HelpId = HID_EVT_MOUSEEXITED; }
-hidspecial HID_EVT_MOUSEMOVED { HelpId = HID_EVT_MOUSEMOVED; }
-hidspecial HID_EVT_MOUSEPRESSED { HelpId = HID_EVT_MOUSEPRESSED; }
-hidspecial HID_EVT_MOUSERELEASED { HelpId = HID_EVT_MOUSERELEASED; }
-hidspecial HID_EVT_POSITIONED { HelpId = HID_EVT_POSITIONED; }
-hidspecial HID_EVT_POSITIONING { HelpId = HID_EVT_POSITIONING; }
-hidspecial HID_EVT_RELOADED { HelpId = HID_EVT_RELOADED; }
-hidspecial HID_EVT_RELOADING { HelpId = HID_EVT_RELOADING; }
-hidspecial HID_EVT_RESETTED { HelpId = HID_EVT_RESETTED; }
-hidspecial HID_EVT_ROWCHANGE { HelpId = HID_EVT_ROWCHANGE; }
-hidspecial HID_EVT_SUBMITTED { HelpId = HID_EVT_SUBMITTED; }
-hidspecial HID_EVT_TEXTCHANGED { HelpId = HID_EVT_TEXTCHANGED; }
-hidspecial HID_EVT_UNLOADED { HelpId = HID_EVT_UNLOADED; }
-hidspecial HID_EVT_UNLOADING { HelpId = HID_EVT_UNLOADING; }
-
-hidspecial HID_FIELDLINK_DETAIL_COLUMN { HelpId = HID_FIELDLINK_DETAIL_COLUMN; }
-hidspecial HID_FIELDLINK_MASTER_COLUMN { HelpId = HID_FIELDLINK_MASTER_COLUMN; }
-
-hidspecial HID_GRIDWIZARD_CANCEL { HelpId = HID_GRIDWIZARD_CANCEL; }
-hidspecial HID_GRIDWIZARD_FINISH { HelpId = HID_GRIDWIZARD_FINISH; }
-hidspecial HID_GRIDWIZARD_NEXT { HelpId = HID_GRIDWIZARD_NEXT; }
-hidspecial HID_GRIDWIZARD_PREVIOUS { HelpId = HID_GRIDWIZARD_PREVIOUS; };
-hidspecial HID_GROUPWIZARD_CANCEL { HelpId = HID_GROUPWIZARD_CANCEL; }
-hidspecial HID_GROUPWIZARD_FINISH { HelpId = HID_GROUPWIZARD_FINISH; }
-hidspecial HID_GROUPWIZARD_NEXT { HelpId = HID_GROUPWIZARD_NEXT; }
-hidspecial HID_GROUPWIZARD_PREVIOUS { HelpId = HID_GROUPWIZARD_PREVIOUS; }
-
-hidspecial HID_LISTWIZARD_CANCEL { HelpId = HID_LISTWIZARD_CANCEL; }
-hidspecial HID_LISTWIZARD_FINISH { HelpId = HID_LISTWIZARD_FINISH; }
-hidspecial HID_LISTWIZARD_NEXT { HelpId = HID_LISTWIZARD_NEXT; }
-hidspecial HID_LISTWIZARD_PREVIOUS { HelpId = HID_LISTWIZARD_PREVIOUS; }
-
-hidspecial HID_PROP_ALIGN { HelpId = HID_PROP_ALIGN; }
-hidspecial HID_PROP_ALLOW_ADDITIONS { HelpId = HID_PROP_ALLOW_ADDITIONS; }
-hidspecial HID_PROP_ALLOW_DELETIONS { HelpId = HID_PROP_ALLOW_DELETIONS; }
-hidspecial HID_PROP_ALLOW_EDITS { HelpId = HID_PROP_ALLOW_EDITS; }
-hidspecial HID_PROP_ANCHOR_TYPE { HelpId = HID_PROP_ANCHOR_TYPE; }
-hidspecial HID_PROP_AUTOCOMPLETE { HelpId = HID_PROP_AUTOCOMPLETE; }
-hidspecial HID_PROP_AUTOLINEBREAK { HelpId = HID_PROP_AUTOLINEBREAK; }
-hidspecial HID_PROP_BACKGROUNDCOLOR { HelpId = HID_PROP_BACKGROUNDCOLOR; }
-hidspecial HID_PROP_BINDING_NAME { HelpId = HID_PROP_BINDING_NAME; }
-hidspecial HID_PROP_BIND_EXPRESSION { HelpId = HID_PROP_BIND_EXPRESSION; }
-hidspecial HID_PROP_BLOCKINCREMENT { HelpId = HID_PROP_BLOCKINCREMENT; }
-hidspecial HID_PROP_BORDER { HelpId = HID_PROP_BORDER; }
-hidspecial HID_PROP_BORDERCOLOR { HelpId = HID_PROP_BORDERCOLOR; }
-hidspecial HID_PROP_BOUNDCOLUMN { HelpId = HID_PROP_BOUNDCOLUMN; }
-hidspecial HID_PROP_BOUND_CELL { HelpId = HID_PROP_BOUND_CELL; }
-hidspecial HID_PROP_BUTTONTYPE { HelpId = HID_PROP_BUTTONTYPE; }
-hidspecial HID_PROP_CELL_EXCHANGE_TYPE { HelpId = HID_PROP_CELL_EXCHANGE_TYPE; }
-hidspecial HID_PROP_CLASSID { HelpId = HID_PROP_CLASSID; }
-hidspecial HID_PROP_CONTROLLABEL { HelpId = HID_PROP_CONTROLLABEL; }
-hidspecial HID_PROP_CONTROLSOURCE { HelpId = HID_PROP_CONTROLSOURCE; }
-hidspecial HID_PROP_CURRENCYSYMBOL { HelpId = HID_PROP_CURRENCYSYMBOL; }
-hidspecial HID_PROP_CURRSYM_POSITION { HelpId = HID_PROP_CURRSYM_POSITION; }
-hidspecial HID_PROP_CURSORSOURCE { HelpId = HID_PROP_CURSORSOURCE; }
-hidspecial HID_PROP_CURSORSOURCETYPE { HelpId = HID_PROP_CURSORSOURCETYPE; }
-hidspecial HID_PROP_CURSORTYPE { HelpId = HID_PROP_CURSORTYPE; }
-hidspecial HID_PROP_CYCLE { HelpId = HID_PROP_CYCLE; }
-hidspecial HID_PROP_DATAENTRY { HelpId = HID_PROP_DATAENTRY; }
-hidspecial HID_PROP_DATASOURCE { HelpId = HID_PROP_DATASOURCE; }
-hidspecial HID_PROP_DATE { HelpId = HID_PROP_DATE; }
-hidspecial HID_PROP_DATEFORMAT { HelpId = HID_PROP_DATEFORMAT; }
-hidspecial HID_PROP_DATEMAX { HelpId = HID_PROP_DATEMAX; }
-hidspecial HID_PROP_DATEMIN { HelpId = HID_PROP_DATEMIN; }
-hidspecial HID_PROP_DECIMAL_ACCURACY { HelpId = HID_PROP_DECIMAL_ACCURACY; }
-hidspecial HID_PROP_DECORATION { HelpId = HID_PROP_DECORATION; }
-hidspecial HID_PROP_DEFAULTVALUE { HelpId = HID_PROP_DEFAULTVALUE; }
-hidspecial HID_PROP_DEFAULT_BUTTON { HelpId = HID_PROP_DEFAULT_BUTTON; }
-hidspecial HID_PROP_DEFAULT_DATE { HelpId = HID_PROP_DEFAULT_DATE; }
-hidspecial HID_PROP_DEFAULT_LONG_VALUE { HelpId = HID_PROP_DEFAULT_LONG_VALUE; }
-hidspecial HID_PROP_DEFAULT_SCROLLVALUE { HelpId = HID_PROP_DEFAULT_SCROLLVALUE; }
-hidspecial HID_PROP_DEFAULT_SELECT_SEQ { HelpId = HID_PROP_DEFAULT_SELECT_SEQ; }
-hidspecial HID_PROP_DEFAULT_SPINVALUE { HelpId = HID_PROP_DEFAULT_SPINVALUE; }
-hidspecial HID_PROP_DEFAULT_STATE { HelpId = HID_PROP_DEFAULT_STATE; }
-hidspecial HID_PROP_DEFAULT_TIME { HelpId = HID_PROP_DEFAULT_TIME; }
-hidspecial HID_PROP_DIRTY { HelpId = HID_PROP_DIRTY; }
-hidspecial HID_PROP_DROPDOWN { HelpId = HID_PROP_DROPDOWN; }
-hidspecial HID_PROP_ECHO_CHAR { HelpId = HID_PROP_ECHO_CHAR; }
-hidspecial HID_PROP_EDITABLE { HelpId = HID_PROP_EDITABLE; }
-hidspecial HID_PROP_EDITMASK { HelpId = HID_PROP_EDITMASK; }
-hidspecial HID_PROP_EFFECTIVEDEFAULT { HelpId = HID_PROP_EFFECTIVEDEFAULT; }
-hidspecial HID_PROP_EFFECTIVEMAX { HelpId = HID_PROP_EFFECTIVEMAX; }
-hidspecial HID_PROP_EFFECTIVEMIN { HelpId = HID_PROP_EFFECTIVEMIN; }
-hidspecial HID_PROP_EMPTY_IS_NULL { HelpId = HID_PROP_EMPTY_IS_NULL; }
-hidspecial HID_PROP_ENABLED { HelpId = HID_PROP_ENABLED; }
-hidspecial HID_PROP_ENABLE_VISIBLE { HelpId = HID_PROP_ENABLE_VISIBLE; }
-hidspecial HID_PROP_ESCAPE_PROCESSING { HelpId = HID_PROP_ESCAPE_PROCESSING; }
-hidspecial HID_PROP_FILLCOLOR { HelpId = HID_PROP_FILLCOLOR; }
-hidspecial HID_PROP_FILTER { HelpId = HID_PROP_FILTER; }
-hidspecial HID_PROP_FILTERPROPOSAL { HelpId = HID_PROP_FILTERPROPOSAL; }
-hidspecial HID_PROP_FOCUSONCLICK { HelpId = HID_PROP_FOCUSONCLICK; }
-hidspecial HID_PROP_FONT { HelpId = HID_PROP_FONT; }
-hidspecial HID_PROP_FORMATKEY { HelpId = HID_PROP_FORMATKEY; }
-hidspecial HID_PROP_GROUPBOX { HelpId = HID_PROP_GROUPBOX; }
-hidspecial HID_PROP_GROUP_NAME { HelpId = HID_PROP_GROUP_NAME; }
-hidspecial HID_PROP_HEIGHT { HelpId = HID_PROP_HEIGHT; }
-hidspecial HID_PROP_HELPTEXT { HelpId = HID_PROP_HELPTEXT; }
-hidspecial HID_PROP_HELPURL { HelpId = HID_PROP_HELPURL; }
-hidspecial HID_PROP_HIDDEN_VALUE { HelpId = HID_PROP_HIDDEN_VALUE; }
-hidspecial HID_PROP_HIDEINACTIVESELECTION { HelpId = HID_PROP_HIDEINACTIVESELECTION; }
-hidspecial HID_PROP_HSCROLL { HelpId = HID_PROP_HSCROLL; }
-hidspecial HID_PROP_ICONSIZE { HelpId = HID_PROP_ICONSIZE; }
-hidspecial HID_PROP_IMAGEPOSITION { HelpId = HID_PROP_IMAGEPOSITION; }
-hidspecial HID_PROP_IMAGE_URL { HelpId = HID_PROP_IMAGE_URL; }
-hidspecial HID_PROP_INPUT_REQUIRED { HelpId = HID_PROP_INPUT_REQUIRED; }
-hidspecial HID_PROP_INVOKES_STOP_NOT_EDITING { HelpId = HID_PROP_INVOKES_STOP_NOT_EDITING; }
-hidspecial HID_PROP_LABEL { HelpId = HID_PROP_LABEL; }
-hidspecial HID_PROP_LEFT { HelpId = HID_PROP_LEFT; }
-hidspecial HID_PROP_LINECOLOR { HelpId = HID_PROP_LINECOLOR; }
-hidspecial HID_PROP_LINECOUNT { HelpId = HID_PROP_LINECOUNT; }
-hidspecial HID_PROP_LINEEND_FORMAT { HelpId = HID_PROP_LINEEND_FORMAT; }
-hidspecial HID_PROP_LINEINCREMENT { HelpId = HID_PROP_LINEINCREMENT; }
-hidspecial HID_PROP_LISTINDEX { HelpId = HID_PROP_LISTINDEX; }
-hidspecial HID_PROP_LISTSOURCE { HelpId = HID_PROP_LISTSOURCE; }
-hidspecial HID_PROP_LISTSOURCETYPE { HelpId = HID_PROP_LISTSOURCETYPE; }
-hidspecial HID_PROP_LIST_BINDING { HelpId = HID_PROP_LIST_BINDING; }
-hidspecial HID_PROP_LIST_CELL_RANGE { HelpId = HID_PROP_LIST_CELL_RANGE; }
-hidspecial HID_PROP_LITERALMASK { HelpId = HID_PROP_LITERALMASK; }
-hidspecial HID_PROP_LOCKED { HelpId = HID_PROP_LOCKED; }
-hidspecial HID_PROP_MASTERFIELDS { HelpId = HID_PROP_MASTERFIELDS; }
-hidspecial HID_PROP_MAXTEXTLEN { HelpId = HID_PROP_MAXTEXTLEN; }
-hidspecial HID_PROP_MULTILINE { HelpId = HID_PROP_MULTILINE; }
-hidspecial HID_PROP_MULTISELECTION { HelpId = HID_PROP_MULTISELECTION; }
-hidspecial HID_PROP_NAME { HelpId = HID_PROP_NAME; }
-hidspecial HID_PROP_NAVIGATION { HelpId = HID_PROP_NAVIGATION; }
-hidspecial HID_PROP_NAVIGATIONBAR { HelpId = HID_PROP_NAVIGATIONBAR; }
-hidspecial HID_PROP_NOLABEL { HelpId = HID_PROP_NOLABEL; }
-hidspecial HID_PROP_OLDVALUE { HelpId = HID_PROP_OLDVALUE; }
-hidspecial HID_PROP_ORIENTATION { HelpId = HID_PROP_ORIENTATION; }
-hidspecial HID_PROP_POSITIONX { HelpId = HID_PROP_POSITIONX; }
-hidspecial HID_PROP_POSITIONY { HelpId = HID_PROP_POSITIONY; }
-hidspecial HID_PROP_PRINTABLE { HelpId = HID_PROP_PRINTABLE; }
-hidspecial HID_PROP_PROGRESSVALUE { HelpId = HID_PROP_PROGRESSVALUE; }
-hidspecial HID_PROP_PROGRESSVALUE_MAX { HelpId = HID_PROP_PROGRESSVALUE_MAX; }
-hidspecial HID_PROP_PROGRESSVALUE_MIN { HelpId = HID_PROP_PROGRESSVALUE_MIN; }
-hidspecial HID_PROP_PUSHBUTTONTYPE { HelpId = HID_PROP_PUSHBUTTONTYPE; }
-hidspecial HID_PROP_READONLY { HelpId = HID_PROP_READONLY; }
-hidspecial HID_PROP_RECORDMARKER { HelpId = HID_PROP_RECORDMARKER; }
-hidspecial HID_PROP_REFVALUE { HelpId = HID_PROP_REFVALUE; }
-hidspecial HID_PROP_REPEAT { HelpId = HID_PROP_REPEAT; }
-hidspecial HID_PROP_REPEAT_DELAY { HelpId = HID_PROP_REPEAT_DELAY; }
-hidspecial HID_PROP_REQUIRED { HelpId = HID_PROP_REQUIRED; }
-hidspecial HID_PROP_RIGHT { HelpId = HID_PROP_RIGHT; }
-hidspecial HID_PROP_ROOT_DISPLAYED { HelpId = HID_PROP_ROOT_DISPLAYED; }
-hidspecial HID_PROP_ROWHEIGHT { HelpId = HID_PROP_ROWHEIGHT; }
-hidspecial HID_PROP_ROW_HEIGHT { HelpId = HID_PROP_ROW_HEIGHT; }
-hidspecial HID_PROP_SCALEIMAGE { HelpId = HID_PROP_SCALEIMAGE; }
-hidspecial HID_PROP_SCROLLVALUE { HelpId = HID_PROP_SCROLLVALUE; }
-hidspecial HID_PROP_SCROLLVALUEMIN { HelpId = HID_PROP_SCROLLVALUE_MIN; }
-hidspecial HID_PROP_SCROLLVALUE_MAX { HelpId = HID_PROP_SCROLLVALUE_MAX; }
-hidspecial HID_PROP_SCROLLVALUE_MIN { HelpId = HID_PROP_SCROLLVALUE_MIN; }
-hidspecial HID_PROP_SEARCHING { HelpId = HID_PROP_SEARCHING; }
-hidspecial HID_PROP_SELECTEDITEMS { HelpId = HID_PROP_SELECTEDITEMS; }
-hidspecial HID_PROP_SELECTION_TYPE { HelpId = HID_PROP_SELECTION_TYPE; }
-hidspecial HID_PROP_SHOWS_HANDLES { HelpId = HID_PROP_SHOWS_HANDLES; }
-hidspecial HID_PROP_SHOWS_ROOT_HANDLES { HelpId = HID_PROP_SHOWS_ROOT_HANDLES; }
-hidspecial HID_PROP_SHOWTHOUSANDSEP { HelpId = HID_PROP_SHOWTHOUSANDSEP; }
-hidspecial HID_PROP_SHOW_FILTERSORT { HelpId = HID_PROP_SHOW_FILTERSORT; }
-hidspecial HID_PROP_SHOW_NAVIGATION { HelpId = HID_PROP_SHOW_NAVIGATION; }
-hidspecial HID_PROP_SHOW_POSITION { HelpId = HID_PROP_SHOW_POSITION; }
-hidspecial HID_PROP_SHOW_RECORDACTIONS { HelpId = HID_PROP_SHOW_RECORDACTIONS; }
-hidspecial HID_PROP_SHOW_SCROLLBARS { HelpId = HID_PROP_SHOW_SCROLLBARS; }
-hidspecial HID_PROP_SLAVEFIELDS { HelpId = HID_PROP_SLAVEFIELDS; }
-hidspecial HID_PROP_SORT_CRITERIA { HelpId = HID_PROP_SORT_CRITERIA; }
-hidspecial HID_PROP_SPIN { HelpId = HID_PROP_SPIN; }
-hidspecial HID_PROP_SPININCREMENT { HelpId = HID_PROP_SPININCREMENT; }
-hidspecial HID_PROP_SPINVALUE { HelpId = HID_PROP_SPINVALUE; }
-hidspecial HID_PROP_SPINVALUE_MAX { HelpId = HID_PROP_SPINVALUE_MAX; }
-hidspecial HID_PROP_SPINVALUE_MIN { HelpId = HID_PROP_SPINVALUE_MIN; }
-hidspecial HID_PROP_STATE { HelpId = HID_PROP_STATE; }
-hidspecial HID_PROP_STEP { HelpId = HID_PROP_STEP; }
-hidspecial HID_PROP_STRICTFORMAT { HelpId = HID_PROP_STRICTFORMAT; }
-hidspecial HID_PROP_STRINGITEMLIST { HelpId = HID_PROP_STRINGITEMLIST; }
-hidspecial HID_PROP_SUBMISSION_ID { HelpId = HID_PROP_SUBMISSION_ID; }
-hidspecial HID_PROP_SUBMIT_ACTION { HelpId = HID_PROP_SUBMIT_ACTION; }
-hidspecial HID_PROP_SUBMIT_ENCODING { HelpId = HID_PROP_SUBMIT_ENCODING; }
-hidspecial HID_PROP_SUBMIT_METHOD { HelpId = HID_PROP_SUBMIT_METHOD; }
-hidspecial HID_PROP_SUBMIT_TARGET { HelpId = HID_PROP_SUBMIT_TARGET; }
-hidspecial HID_PROP_SYMBOLCOLOR { HelpId = HID_PROP_SYMBOLCOLOR; }
-hidspecial HID_PROP_TABINDEX { HelpId = HID_PROP_TABINDEX; }
-hidspecial HID_PROP_TABORDER_CONTROLS { HelpId = HID_PROP_TABORDER_CONTROLS; }
-hidspecial HID_PROP_TABSTOP { HelpId = HID_PROP_TABSTOP; }
-hidspecial HID_PROP_TAG { HelpId = HID_PROP_TAG; }
-hidspecial HID_PROP_TARGET_FRAME { HelpId = HID_PROP_TARGET_FRAME; }
-hidspecial HID_PROP_TARGET_URL { HelpId = HID_PROP_TARGET_URL; }
-hidspecial HID_PROP_TEXT { HelpId = HID_PROP_TEXT; }
-hidspecial HID_PROP_TEXTTYPE { HelpId = HID_PROP_TEXTTYPE; }
-hidspecial HID_PROP_TIME { HelpId = HID_PROP_TIME; }
-hidspecial HID_PROP_TIMEFORMAT { HelpId = HID_PROP_TIMEFORMAT; }
-hidspecial HID_PROP_TIMEMAX { HelpId = HID_PROP_TIMEMAX; }
-hidspecial HID_PROP_TIMEMIN { HelpId = HID_PROP_TIMEMIN; }
-hidspecial HID_PROP_TITLE { HelpId = HID_PROP_TITLE; }
-hidspecial HID_PROP_TOGGLE { HelpId = HID_PROP_TOGGLE; }
-hidspecial HID_PROP_TRISTATE { HelpId = HID_PROP_TRISTATE; }
-hidspecial HID_PROP_UNCHECKEDREFVALUE { HelpId = HID_PROP_UNCHECKEDREFVALUE; }
-hidspecial HID_PROP_UNIQUE { HelpId = HID_PROP_UNIQUE; }
-hidspecial HID_PROP_VALUE { HelpId = HID_PROP_VALUE; }
-hidspecial HID_PROP_VALUEMAX { HelpId = HID_PROP_VALUEMAX; }
-hidspecial HID_PROP_VALUEMIN { HelpId = HID_PROP_VALUEMIN; }
-hidspecial HID_PROP_VALUESTEP { HelpId = HID_PROP_VALUESTEP; }
-hidspecial HID_PROP_VERTICAL_ALIGN { HelpId = HID_PROP_VERTICAL_ALIGN; }
-hidspecial HID_PROP_VISIBLESIZE { HelpId = HID_PROP_VISIBLESIZE; }
-hidspecial HID_PROP_VISUALEFFECT { HelpId = HID_PROP_VISUALEFFECT; }
-hidspecial HID_PROP_VSCROLL { HelpId = HID_PROP_VSCROLL; }
-hidspecial HID_PROP_WHEEL_BEHAVIOR { HelpId = HID_PROP_WHEEL_BEHAVIOR; }
-hidspecial HID_PROP_WIDTH { HelpId = HID_PROP_WIDTH; }
-hidspecial HID_PROP_WORDBREAK { HelpId = HID_PROP_WORDBREAK; }
-hidspecial HID_PROP_WRITING_MODE { HelpId = HID_PROP_WRITING_MODE; }
-hidspecial HID_PROP_XML_DATA_MODEL { HelpId = HID_PROP_XML_DATA_MODEL; }
-hidspecial HID_PROP_XSD_CALCULATION { HelpId = HID_PROP_XSD_CALCULATION; }
-hidspecial HID_PROP_XSD_CONSTRAINT { HelpId = HID_PROP_XSD_CONSTRAINT; }
-hidspecial HID_PROP_XSD_DATA_TYPE { HelpId = HID_PROP_XSD_DATA_TYPE; }
-hidspecial HID_PROP_XSD_FRACTION_DIGITS { HelpId = HID_PROP_XSD_FRACTION_DIGITS; }
-hidspecial HID_PROP_XSD_LENGTH { HelpId = HID_PROP_XSD_LENGTH; }
-hidspecial HID_PROP_XSD_MAX_EXCLUSIVE { HelpId = HID_PROP_XSD_MAX_EXCLUSIVE; }
-hidspecial HID_PROP_XSD_MAX_INCLUSIVE { HelpId = HID_PROP_XSD_MAX_INCLUSIVE; }
-hidspecial HID_PROP_XSD_MAX_LENGTH { HelpId = HID_PROP_XSD_MAX_LENGTH; }
-hidspecial HID_PROP_XSD_MIN_EXCLUSIVE { HelpId = HID_PROP_XSD_MIN_EXCLUSIVE; }
-hidspecial HID_PROP_XSD_MIN_INCLUSIVE { HelpId = HID_PROP_XSD_MIN_INCLUSIVE; }
-hidspecial HID_PROP_XSD_MIN_LENGTH { HelpId = HID_PROP_XSD_MIN_LENGTH; }
-hidspecial HID_PROP_XSD_PATTERN { HelpId = HID_PROP_XSD_PATTERN; }
-hidspecial HID_PROP_XSD_READONLY { HelpId = HID_PROP_XSD_READONLY; }
-hidspecial HID_PROP_XSD_RELEVANT { HelpId = HID_PROP_XSD_RELEVANT; }
-hidspecial HID_PROP_XSD_REQUIRED { HelpId = HID_PROP_XSD_REQUIRED; }
-hidspecial HID_PROP_XSD_TOTAL_DIGITS { HelpId = HID_PROP_XSD_TOTAL_DIGITS; }
-hidspecial HID_PROP_XSD_WHITESPACES { HelpId = HID_PROP_XSD_WHITESPACES; }
-
-hidspecial HID_SELECTION_TLB { HelpId = HID_SELECTION_TLB; }
-
-hidspecial UID_ABSPILOT_HELP { HelpId = UID_ABSPILOT_HELP; }
-hidspecial UID_BIB_FRAME_WINDOW { HelpId = UID_BIB_FRAME_WINDOW;}
-
-hidspecial UID_BRWEVT_ACTIONPERFORMED { HelpId = UID_BRWEVT_ACTIONPERFORMED; }
-hidspecial UID_BRWEVT_ADJUSTMENTVALUECHANGED { HelpId = UID_BRWEVT_ADJUSTMENTVALUECHANGED; }
-hidspecial UID_BRWEVT_AFTERUPDATE { HelpId = UID_BRWEVT_AFTERUPDATE; }
-hidspecial UID_BRWEVT_APPROVEACTIONPERFORMED { HelpId = UID_BRWEVT_APPROVEACTIONPERFORMED; }
-hidspecial UID_BRWEVT_APPROVEPARAMETER { HelpId = UID_BRWEVT_APPROVEPARAMETER; }
-hidspecial UID_BRWEVT_APPROVERESETTED { HelpId = UID_BRWEVT_APPROVERESETTED; }
-hidspecial UID_BRWEVT_APPROVEROWCHANGE { HelpId = UID_BRWEVT_APPROVEROWCHANGE; }
-hidspecial UID_BRWEVT_BEFOREUPDATE { HelpId = UID_BRWEVT_BEFOREUPDATE; }
-hidspecial UID_BRWEVT_CHANGED { HelpId = UID_BRWEVT_CHANGED; }
-hidspecial UID_BRWEVT_CONFIRMDELETE { HelpId = UID_BRWEVT_CONFIRMDELETE; }
-hidspecial UID_BRWEVT_ERROROCCURRED { HelpId = UID_BRWEVT_ERROROCCURRED; }
-hidspecial UID_BRWEVT_FOCUSGAINED { HelpId = UID_BRWEVT_FOCUSGAINED; }
-hidspecial UID_BRWEVT_FOCUSLOST { HelpId = UID_BRWEVT_FOCUSLOST; }
-hidspecial UID_BRWEVT_ITEMSTATECHANGED { HelpId = UID_BRWEVT_ITEMSTATECHANGED; }
-hidspecial UID_BRWEVT_KEYTYPED { HelpId = UID_BRWEVT_KEYTYPED; }
-hidspecial UID_BRWEVT_KEYUP { HelpId = UID_BRWEVT_KEYUP; }
-hidspecial UID_BRWEVT_LOADED { HelpId = UID_BRWEVT_LOADED; }
-hidspecial UID_BRWEVT_MOUSEDRAGGED { HelpId = UID_BRWEVT_MOUSEDRAGGED; }
-hidspecial UID_BRWEVT_MOUSEENTERED { HelpId = UID_BRWEVT_MOUSEENTERED; }
-hidspecial UID_BRWEVT_MOUSEEXITED { HelpId = UID_BRWEVT_MOUSEEXITED; }
-hidspecial UID_BRWEVT_MOUSEMOVED { HelpId = UID_BRWEVT_MOUSEMOVED; }
-hidspecial UID_BRWEVT_MOUSEPRESSED { HelpId = UID_BRWEVT_MOUSEPRESSED; }
-hidspecial UID_BRWEVT_MOUSERELEASED { HelpId = UID_BRWEVT_MOUSERELEASED; }
-hidspecial UID_BRWEVT_POSITIONED { HelpId = UID_BRWEVT_POSITIONED; }
-hidspecial UID_BRWEVT_POSITIONING { HelpId = UID_BRWEVT_POSITIONING; }
-hidspecial UID_BRWEVT_RELOADED { HelpId = UID_BRWEVT_RELOADED; }
-hidspecial UID_BRWEVT_RELOADING { HelpId = UID_BRWEVT_RELOADING; }
-hidspecial UID_BRWEVT_RESETTED { HelpId = UID_BRWEVT_RESETTED; }
-hidspecial UID_BRWEVT_ROWCHANGE { HelpId = UID_BRWEVT_ROWCHANGE; }
-hidspecial UID_BRWEVT_SUBMITTED { HelpId = UID_BRWEVT_SUBMITTED; }
-hidspecial UID_BRWEVT_TEXTCHANGED { HelpId = UID_BRWEVT_TEXTCHANGED; }
-hidspecial UID_BRWEVT_UNLOADED { HelpId = UID_BRWEVT_UNLOADED; }
-hidspecial UID_BRWEVT_UNLOADING { HelpId = UID_BRWEVT_UNLOADING; }
-
-hidspecial UID_EVT_MACRODLG { HelpId = UID_EVT_MACRODLG; }
-
-hidspecial UID_FIELDLINK_DETAIL1 { HelpId = UID_FIELDLINK_DETAIL1; }
-hidspecial UID_FIELDLINK_DETAIL2 { HelpId = UID_FIELDLINK_DETAIL2; }
-hidspecial UID_FIELDLINK_DETAIL3 { HelpId = UID_FIELDLINK_DETAIL3; }
-hidspecial UID_FIELDLINK_DETAIL4 { HelpId = UID_FIELDLINK_DETAIL4; }
-hidspecial UID_FIELDLINK_MASTER1 { HelpId = UID_FIELDLINK_MASTER1; }
-hidspecial UID_FIELDLINK_MASTER2 { HelpId = UID_FIELDLINK_MASTER2; }
-hidspecial UID_FIELDLINK_MASTER3 { HelpId = UID_FIELDLINK_MASTER3; }
-hidspecial UID_FIELDLINK_MASTER4 { HelpId = UID_FIELDLINK_MASTER4; }
-
-hidspecial UID_PROP_ADD_DATA_TYPE { HelpId = UID_PROP_ADD_DATA_TYPE; }
-hidspecial UID_PROP_DLG_ATTR_DATASOURCE { HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
-hidspecial UID_PROP_DLG_ATTR_DATASOURCE { HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
-hidspecial UID_PROP_DLG_ATTR_TARGET_URL { HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
-hidspecial UID_PROP_DLG_ATTR_TARGET_URL { HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
-hidspecial UID_PROP_DLG_BACKGROUNDCOLOR { HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
-hidspecial UID_PROP_DLG_BACKGROUNDCOLOR { HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
-hidspecial UID_PROP_DLG_BIND_EXPRESSION { HelpId = UID_PROP_DLG_BIND_EXPRESSION; }
-hidspecial UID_PROP_DLG_BORDERCOLOR { HelpId = UID_PROP_DLG_BORDERCOLOR; }
-hidspecial UID_PROP_DLG_CONTROLLABEL { HelpId = UID_PROP_DLG_CONTROLLABEL; }
-hidspecial UID_PROP_DLG_CONTROLLABEL { HelpId = UID_PROP_DLG_CONTROLLABEL; }
-hidspecial UID_PROP_DLG_FILLCOLOR { HelpId = UID_PROP_DLG_FILLCOLOR; }
-hidspecial UID_PROP_DLG_FILLCOLOR { HelpId = UID_PROP_DLG_FILLCOLOR; }
-hidspecial UID_PROP_DLG_FILTER { HelpId = UID_PROP_DLG_FILTER; }
-hidspecial UID_PROP_DLG_FONT_TYPE { HelpId = UID_PROP_DLG_FONT_TYPE; }
-hidspecial UID_PROP_DLG_FONT_TYPE { HelpId = UID_PROP_DLG_FONT_TYPE; }
-hidspecial UID_PROP_DLG_FORMLINKFIELDS { HelpId = UID_PROP_DLG_FORMLINKFIELDS; }
-hidspecial UID_PROP_DLG_IMAGE_URL { HelpId = UID_PROP_DLG_IMAGE_URL; }
-hidspecial UID_PROP_DLG_IMAGE_URL { HelpId = UID_PROP_DLG_IMAGE_URL; }
-hidspecial UID_PROP_DLG_NUMBER_FORMAT { HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
-hidspecial UID_PROP_DLG_NUMBER_FORMAT { HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
-hidspecial UID_PROP_DLG_ORDER { HelpId = UID_PROP_DLG_ORDER; }
-hidspecial UID_PROP_DLG_SELECTION { HelpId = UID_PROP_DLG_SELECTION; }
-hidspecial UID_PROP_DLG_SQLCOMMAND { HelpId = UID_PROP_DLG_SQLCOMMAND; }
-hidspecial UID_PROP_DLG_SYMBOLCOLOR { HelpId = UID_PROP_DLG_SYMBOLCOLOR; }
-hidspecial UID_PROP_DLG_TABINDEX { HelpId = UID_PROP_DLG_TABINDEX; }
-hidspecial UID_PROP_DLG_XSD_CALCULATION { HelpId = UID_PROP_DLG_XSD_CALCULATION; }
-hidspecial UID_PROP_DLG_XSD_CONSTRAINT { HelpId = UID_PROP_DLG_XSD_CONSTRAINT; }
-hidspecial UID_PROP_DLG_XSD_READONLY { HelpId = UID_PROP_DLG_XSD_READONLY; }
-hidspecial UID_PROP_DLG_XSD_RELEVANT { HelpId = UID_PROP_DLG_XSD_RELEVANT; }
-hidspecial UID_PROP_DLG_XSD_REQUIRED { HelpId = UID_PROP_DLG_XSD_REQUIRED; }
-hidspecial UID_PROP_REMOVE_DATA_TYPE { HelpId = UID_PROP_REMOVE_DATA_TYPE; }
-hidspecial HID_FM_PROPDLG_TABCTR { HelpId = HID_FM_PROPDLG_TABCTR; }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list