[Libreoffice-commits] .: 32 commits - configmgr/JunitTest_configmgr_unoapi.mk connectivity/source drawinglayer/Library_drawinglayer.mk editeng/Library_editeng.mk editeng/source formula/Library_for.mk formula/Library_forui.mk framework/JunitTest_framework_complex.mk framework/JunitTest_framework_unoapi.mk framework/Library_fwe.mk framework/Library_fwi.mk idl/Executable_svidl.mk idl/inc idl/Makefile idl/Module_idl.mk idl/prj idl/source idl/util linguistic/inc linguistic/JunitTest_linguistic_complex.mk linguistic/JunitTest_linguistic_unoapi.mk linguistic/Library_lng.mk linguistic/Module_linguistic.mk linguistic/Package_inc.mk linguistic/prj linguistic/qa linguistic/source oovbaapi/Makefile sfx2/CppunitTest_sfx2_metadatable.mk sfx2/inc sfx2/JunitTest_sfx2_complex.mk sfx2/JunitTest_sfx2_unoapi.mk sfx2/Library_qstart.mk sfx2/Library_sfx.mk sfx2/Module_sfx2.mk sfx2/Package_inc.mk sfx2/prj sfx2/qa sfx2/source svx/JunitTest_svx_unoapi.mk svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textco nversiondlgs.mk ucb/JunitTest_ucb_complex.mk ucb/JunitTest_ucb_unoapi.mk vbahelper/Library_vbahelper.mk xmloff/JunitTest_xmloff_unoapi.mk xmloff/Library_xo.mk xmlscript/inc xmlscript/Library_xcr.mk xmlscript/Makefile xmlscript/Module_xmlscript.mk xmlscript/Package_dtd.mk xmlscript/Package_inc.mk xmlscript/prj xmlscript/source xmlscript/util
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:49:26 PDT 2011
configmgr/JunitTest_configmgr_unoapi.mk | 2
connectivity/source/drivers/evoab/LCatalog.cxx | 74 -
connectivity/source/drivers/evoab/LCatalog.hxx | 51
connectivity/source/drivers/evoab/LColumnAlias.cxx | 235 ----
connectivity/source/drivers/evoab/LColumnAlias.hxx | 116 --
connectivity/source/drivers/evoab/LColumns.cxx | 59 -
connectivity/source/drivers/evoab/LColumns.hxx | 54
connectivity/source/drivers/evoab/LConfigAccess.cxx | 162 --
connectivity/source/drivers/evoab/LConfigAccess.hxx | 49
connectivity/source/drivers/evoab/LConnection.cxx | 281 ----
connectivity/source/drivers/evoab/LConnection.hxx | 81 -
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx | 398 ------
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx | 58 -
connectivity/source/drivers/evoab/LDebug.cxx | 43
connectivity/source/drivers/evoab/LDebug.hxx | 45
connectivity/source/drivers/evoab/LDriver.cxx | 508 --------
connectivity/source/drivers/evoab/LDriver.hxx | 118 --
connectivity/source/drivers/evoab/LFolderList.cxx | 563 ---------
connectivity/source/drivers/evoab/LFolderList.hxx | 94 -
connectivity/source/drivers/evoab/LNoException.cxx | 325 -----
connectivity/source/drivers/evoab/LPreparedStatement.cxx | 45
connectivity/source/drivers/evoab/LPreparedStatement.hxx | 52
connectivity/source/drivers/evoab/LResultSet.cxx | 191 ---
connectivity/source/drivers/evoab/LResultSet.hxx | 83 -
connectivity/source/drivers/evoab/LStatement.cxx | 45
connectivity/source/drivers/evoab/LStatement.hxx | 52
connectivity/source/drivers/evoab/LTable.cxx | 867 ---------------
connectivity/source/drivers/evoab/LTable.hxx | 102 -
connectivity/source/drivers/evoab/LTables.cxx | 64 -
connectivity/source/drivers/evoab/LTables.hxx | 54
connectivity/source/drivers/evoab/evoab.xcu | 61 -
connectivity/source/drivers/evoab/evoab.xml | 31
connectivity/source/drivers/evoab/makefile.mk | 113 -
drawinglayer/Library_drawinglayer.mk | 3
editeng/Library_editeng.mk | 9
editeng/source/rtf/segincr.asm | 39
formula/Library_for.mk | 3
formula/Library_forui.mk | 3
framework/JunitTest_framework_complex.mk | 2
framework/JunitTest_framework_unoapi.mk | 2
framework/Library_fwe.mk | 8
framework/Library_fwi.mk | 3
idl/Executable_svidl.mk | 68 +
idl/Makefile | 38
idl/Module_idl.mk | 35
idl/inc/makefile.mk | 47
idl/prj/build.lst | 8
idl/prj/d.lst | 2
idl/prj/makefile.mk | 40
idl/source/cmptools/makefile.mk | 48
idl/source/objects/makefile.mk | 51
idl/util/idlpch.cxx | 51
linguistic/JunitTest_linguistic_complex.mk | 53
linguistic/JunitTest_linguistic_unoapi.mk | 72 -
linguistic/Library_lng.mk | 90 +
linguistic/Module_linguistic.mk | 13
linguistic/Package_inc.mk | 40
linguistic/inc/linguistic/hyphdta.hxx | 13
linguistic/inc/linguistic/lngdllapi.h | 45
linguistic/inc/linguistic/lngprophelp.hxx | 93 +
linguistic/inc/linguistic/misc.hxx | 24
linguistic/inc/linguistic/spelldta.hxx | 6
linguistic/inc/makefile.mk | 47
linguistic/prj/build.lst | 8
linguistic/prj/d.lst | 13
linguistic/prj/makefile.mk | 40
linguistic/qa/complex/linguistic/makefile.mk | 61 -
linguistic/source/grammarchecker.cxx | 305 -----
linguistic/source/grammarchecker.hxx | 109 -
linguistic/source/hyphdta.cxx | 16
linguistic/source/lngprophelp.cxx | 155 ++
linguistic/source/makefile.mk | 117 --
linguistic/source/spelldta.cxx | 10
oovbaapi/Makefile | 2
sfx2/CppunitTest_sfx2_metadatable.mk | 1
sfx2/JunitTest_sfx2_complex.mk | 2
sfx2/JunitTest_sfx2_unoapi.mk | 2
sfx2/Library_qstart.mk | 15
sfx2/Library_sfx.mk | 13
sfx2/Module_sfx2.mk | 1
sfx2/Package_inc.mk | 1
sfx2/inc/pch/precompiled_sfx2.hxx | 1
sfx2/inc/sfx2/qswin32.h | 51
sfx2/prj/build.lst | 1
sfx2/qa/complex/sfx2/makefile.mk | 84 -
sfx2/qa/unoapi/makefile.mk | 48
sfx2/source/appl/shutdowniconw32.cxx | 2
svx/JunitTest_svx_unoapi.mk | 2
svx/Library_svx.mk | 6
svx/Library_svxcore.mk | 6
svx/Library_textconversiondlgs.mk | 4
ucb/JunitTest_ucb_complex.mk | 2
ucb/JunitTest_ucb_unoapi.mk | 2
vbahelper/Library_vbahelper.mk | 4
xmloff/JunitTest_xmloff_unoapi.mk | 2
xmloff/Library_xo.mk | 3
xmlscript/Library_xcr.mk | 75 +
xmlscript/Makefile | 38
xmlscript/Module_xmlscript.mk | 36
xmlscript/Package_dtd.mk | 34
xmlscript/Package_inc.mk | 37
xmlscript/inc/makefile.mk | 47
xmlscript/inc/xmlscript/xcrdllapi.h | 45
xmlscript/inc/xmlscript/xml_helper.hxx | 7
xmlscript/inc/xmlscript/xml_import.hxx | 69 -
xmlscript/inc/xmlscript/xmldlg_imexp.hxx | 10
xmlscript/inc/xmlscript/xmllib_imexp.hxx | 14
xmlscript/inc/xmlscript/xmlmod_imexp.hxx | 8
xmlscript/prj/build.lst | 11
xmlscript/prj/d.lst | 14
xmlscript/prj/makefile.mk | 40
xmlscript/source/inc/xml_import.hxx | 68 +
xmlscript/source/misc/makefile.mk | 48
xmlscript/source/xml_helper/makefile.mk | 50
xmlscript/source/xml_helper/xml_impctx.cxx | 2
xmlscript/source/xmldlg_imexp/makefile.mk | 52
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 2
xmlscript/source/xmlflat_imexp/makefile.mk | 50
xmlscript/source/xmllib_imexp/makefile.mk | 50
xmlscript/source/xmllib_imexp/xmllib_import.cxx | 2
xmlscript/source/xmlmod_imexp/makefile.mk | 49
xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 2
xmlscript/util/makefile.mk | 89 -
xmlscript/util/target.pmk | 35
xmlscript/util/xcr.flt | 13
125 files changed, 1289 insertions(+), 6829 deletions(-)
New commits:
commit fd60b412a9609c22afd0f6c27ad089d3be709b7c
Merge: ca569fd... 7346524...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jul 24 19:22:59 2011 +0200
Merge branch 'master' into feature/gnumake4
commit ca569fd5af2fbfd606fe1cca734a386d7989dde9
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 15:23:22 2011 +0200
keep gbuild calls consistent at now, even if it is a bit longer
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 2aeec99..c846e9c 100755
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -165,7 +165,7 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_external,editeng,icuuc)
+$(eval $(call gb_Library_use_external,editeng,icuuc))
# vim: set noet sw=4 ts=4:
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 7c38b66..fdfc6b5 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_add_linked_libs,lng,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_external,lng,icuuc)
+$(eval $(call gb_Library_use_external,lng,icuuc))
$(eval $(call gb_Library_add_exception_objects,lng,\
linguistic/source/convdic \
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 1c33b52..13842f7 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -81,7 +81,7 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
sfx \
))
-$(call gb_Library_use_external,qstart_gtk,libxml2)
+$(eval $(call gb_Library_use_external,qstart_gtk,libxml2))
$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
sfx2/source/appl/shutdowniconunx \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 5b7999e..4af5501 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -86,7 +86,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_external,sfx,libxml2)
+$(eval $(call gb_Library_use_external,sfx,libxml2))
$(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/appl/app \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 1f8e90a..f28254e 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -71,7 +71,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_external,svx,icuuc)
+$(eval $(call gb_Library_use_external,svx,icuuc))
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/accessibility/AccessibleControlShape \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 6cce862..4e1f779 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -86,7 +86,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_external,svxcore,icuuc)
+$(eval $(call gb_Library_use_external,svxcore,icuuc))
$(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/core/coreservices \
commit 9228df53b628ca6bf3298d502aebc56191bf5668
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 21:12:12 2011 +0200
postmerge fixes for gnumake4
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index da39f4d..728563e 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -30,11 +30,15 @@ $(eval $(call gb_Executable_Executable,svidl))
$(eval $(call gb_Executable_set_include,svidl,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/ \
- -I$(OUTDIR)/inc/offuh/ \
-I$(SRCDIR)/idl/inc/pch \
-I$(SRCDIR)/idl/inc \
))
+$(eval $(call gb_Executable_add_api,svidl,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Executable_add_defs,svidl,\
-DIDL_COMPILER \
))
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 00fcc94..7c38b66 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -37,7 +37,11 @@ $(eval $(call gb_Library_set_include,lng,\
$$(INCLUDE) \
-I$(SRCDIR)/linguistic/inc \
-I$(SRCDIR)/linguistic/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,lng,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_defs,lng,\
diff --git a/oovbaapi/Makefile b/oovbaapi/Makefile
new file mode 100644
index 0000000..c898975
--- /dev/null
+++ b/oovbaapi/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 3e63dc9..1c33b52 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -48,8 +48,7 @@ $(eval $(call gb_Library_add_defs,qstart_gtk,\
))
ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
-$(eval $(call gb_Library_set_defs,qstart_gtk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,qstart_gtk,\
-DENABLE_SYSTRAY_GTK \
))
endif
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index d3d2941..5b7999e 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -59,8 +59,7 @@ $(eval $(call gb_Library_add_defs,sfx,\
))
ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
-$(eval $(call gb_Library_set_defs,sfx,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
-DENABLE_QUICKSTART_APPLET \
-DENABLE_SYSTRAY_GTK \
-DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
index d233475..54b05d7 100644
--- a/xmlscript/Library_xcr.mk
+++ b/xmlscript/Library_xcr.mk
@@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,xcr,\
-I$(SRCDIR)/xmlscript/source/inc \
-I$(SRCDIR)/xmlscript/inc/pch \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,xcr,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_defs,xcr,\
commit e0d3595a9447c4271fdf1cfe92d9dc20f5ce5a27
Merge: 336e80e... 628d918...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:51:11 2011 +0200
resyncing to master
diff --cc drawinglayer/Library_drawinglayer.mk
index 5293778,30a9729..8763943
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@@ -35,10 -35,10 +35,9 @@@ $(eval $(call gb_Library_set_include,dr
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/drawinglayer/inc/pch) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,drawinglayer,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,drawinglayer,\
-DDRAWINGLAYER_DLLIMPLEMENTATION \
))
diff --cc editeng/Library_editeng.mk
index f5444d3,35dcbda..2aeec99
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@@ -35,10 -35,10 +35,9 @@@ $(eval $(call gb_Library_set_include,ed
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/editeng/inc/pch) \
-I$(realpath $(SRCDIR)/editeng/inc) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,editeng,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,editeng,\
-DEDITENG_DLLIMPLEMENTATION \
))
diff --cc formula/Library_for.mk
index 0477baf,b077808..14cf9e9
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@@ -38,10 -38,10 +38,9 @@@ $(eval $(call gb_Library_set_include,fo
-I$(realpath $(SRCDIR)/formula/inc/pch) \
-I$(realpath $(SRCDIR)/formula/source/core/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,for,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,for,\
-DFORMULA_DLLIMPLEMENTATION \
))
diff --cc formula/Library_forui.mk
index 5b849f9,c957c39..8c7c6a9
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@@ -35,10 -35,10 +35,9 @@@ $(eval $(call gb_Library_set_include,fo
-I$(realpath $(SRCDIR)/formula/inc/pch) \
-I$(realpath $(SRCDIR)/formula/source/ui/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,forui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,forui,\
-DFORMULA_DLLIMPLEMENTATION \
))
diff --cc framework/Library_fwe.mk
index 51179c4,b69a3a7..9a71be9
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@@ -34,10 -34,10 +34,9 @@@ $(eval $(call gb_Library_set_include,fw
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/framework \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,fwe,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,fwe,\
-DFWE_DLLIMPLEMENTATION\
))
diff --cc sfx2/CppunitTest_sfx2_metadatable.mk
index 0824d40,45a2681..09c2b32
--- a/sfx2/CppunitTest_sfx2_metadatable.mk
+++ b/sfx2/CppunitTest_sfx2_metadatable.mk
@@@ -39,7 -44,7 +44,6 @@@ $(eval $(call gb_CppunitTest_add_linked
$(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
- -I$(OUTDIR)/inc \
))
# vim: set noet sw=4 ts=4:
diff --cc sfx2/Library_qstart.mk
index c775d21,881e78d..3e63dc9
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@@ -38,12 -37,26 +37,24 @@@ $(eval $(call gb_Library_set_include,qs
$(filter -I%,$(GTK_CFLAGS)) \
))
+ $(eval $(call gb_Library_add_api,qstart_gtk,\
+ udkapi \
+ offapi \
+ ))
+
-$(eval $(call gb_Library_set_defs,qstart_gtk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,qstart_gtk,\
-DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \
-DENABLE_QUICKSTART_APPLET \
))
+ ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+ $(eval $(call gb_Library_set_defs,qstart_gtk,\
+ $$(DEFS) \
+ -DENABLE_SYSTRAY_GTK \
+ ))
+ endif
+
-$(eval $(call gb_Library_set_cflags,qstart_gtk,\
- $$(CFLAGS) \
+$(eval $(call gb_Library_add_cflags,qstart_gtk,\
$(filter-out -I%,$(GTK_CFLAGS)) \
))
diff --cc sfx2/Library_sfx.mk
index bb57c4d,bd11257..d3d2941
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@@ -46,11 -51,12 +51,10 @@@ $(eval $(call gb_Library_set_include,sf
-I$(WORKDIR)/SdiTarget/sfx2/sdi \
-I$(WORKDIR)/inc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
- $(LIBXML_CFLAGS) \
))
-$(eval $(call gb_Library_set_defs,sfx,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
-DSFX2_DLLIMPLEMENTATION \
))
diff --cc sfx2/prj/build.lst
index 1cf56d7,3126d35..52f145a
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@@ -1,2 -1,3 +1,2 @@@
- sf sfx2 : TRANSLATIONS:translations idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
+ sf sfx2 : TRANSLATIONS:translations NATIVE:idl basic xmlscript framework readlicense_oo shell DESKTOP:setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
sf sfx2\prj nmake - all sf_prj NULL
-
diff --cc sfx2/source/appl/shutdowniconw32.cxx
index 8c1a00e,04cde46..1b34aaf
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@@ -50,16 -50,9 +50,9 @@@
#include "app.hrc"
#include <shlobj.h>
#include <objidl.h>
- #include <stdio.h>
- #include <io.h>
#include <osl/thread.h>
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
#include <comphelper/sequenceashashmap.hxx>
- #include <comphelper/processfactory.hxx>
- #include <com/sun/star/uno/Reference.h>
- #include <com/sun/star/lang/XMultiServiceFactory.hpp>
- #include <com/sun/star/task/XJob.hpp>
- #include <com/sun/star/beans/NamedValue.hpp>
#include <set>
diff --cc svx/Library_svx.mk
index 2cc9b4a,44b1151..1f8e90a
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@@ -34,10 -34,15 +34,14 @@@ $(eval $(call gb_Library_set_include,sv
-I$(realpath $(SRCDIR)/svx/source/inc) \
-I$(realpath $(SRCDIR)/svx/inc/pch) \
$$(SOLARINC) \
- -I$(OUTDIR)/inc/offuh \
+ ))
+
+ $(eval $(call gb_Library_add_api,svx,\
+ udkapi \
+ offapi \
))
-$(eval $(call gb_Library_set_defs,svx,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svx,\
-DSVX_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
diff --cc svx/Library_textconversiondlgs.mk
index 69bb8c7,c367394..f2d20fc
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@@ -33,9 -33,17 +33,13 @@@ $(eval $(call gb_Library_set_include,te
-I$(realpath $(SRCDIR)/svx/inc) \
-I$(realpath $(SRCDIR)/svx/inc/pch) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+ ))
+
+ $(eval $(call gb_Library_add_api,textconversiondlgs,\
+ udkapi \
+ offapi \
))
-$(eval $(call gb_Library_set_defs,textconversiondlgs,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
comphelper \
cppuhelper \
diff --cc vbahelper/Library_vbahelper.mk
index 45691f8,f9e2a36..dd25d01
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@@ -39,10 -39,10 +39,9 @@@ $(eval $(call gb_Library_add_package_he
# add any additional include paths for this library here
$(eval $(call gb_Library_set_include,vbahelper,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,vbahelper,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vbahelper,\
-DVBAHELPER_DLLIMPLEMENTATION \
))
diff --cc xmloff/Library_xo.mk
index 1ded182,fb95141..1e63c7a
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@@ -37,10 -37,10 +37,9 @@@ $(eval $(call gb_Library_set_include,xo
$$(SOLARINC) \
-I$(realpath $(SRCDIR)/xmloff/inc) \
-I$(realpath $(SRCDIR)/xmloff/inc/pch) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,xo,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,xo,\
-DXMLOFF_DLLIMPLEMENTATION \
))
diff --cc xmlscript/prj/d.lst
index e69de29,2461a74..cde5ebe
--- a/xmlscript/prj/d.lst
+++ b/xmlscript/prj/d.lst
@@@ -1,0 -1,15 +1,1 @@@
+ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-mkdir: %_DEST%\inc\xmlscript
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-
-..\inc\xmlscript\xml_helper.hxx %_DEST%\inc\xmlscript\xml_helper.hxx
-..\inc\xmlscript\xmldlg_imexp.hxx %_DEST%\inc\xmlscript\xmldlg_imexp.hxx
-..\inc\xmlscript\xmllib_imexp.hxx %_DEST%\inc\xmlscript\xmllib_imexp.hxx
-..\inc\xmlscript\xmlmod_imexp.hxx %_DEST%\inc\xmlscript\xmlmod_imexp.hxx
-..\inc\xmlscript\xmlns.h %_DEST%\inc\xmlscript\xmlns.h
-
-..\dtd\*.dtd %_DEST%\bin\*.dtd
-..\%__SRC%\misc\xcr.component %_DEST%\xml\xcr.component
commit 336e80edd12f58e0bb32ccc08d07cb2cf47fbcee
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 14:32:23 2011 +0200
gnumake4: adjust ucb to gbuild
diff --git a/ucb/JunitTest_ucb_complex.mk b/ucb/JunitTest_ucb_complex.mk
index aeacb12..9113ff3 100644
--- a/ucb/JunitTest_ucb_complex.mk
+++ b/ucb/JunitTest_ucb_complex.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_JunitTest_JunitTest,ucb_complex))
+$(eval $(call gb_JunitTest_JunitTest,ucb_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,ucb_complex,\
$$(DEFS) \
diff --git a/ucb/JunitTest_ucb_unoapi.mk b/ucb/JunitTest_ucb_unoapi.mk
index 0a1f9a1..7747afa 100644
--- a/ucb/JunitTest_ucb_unoapi.mk
+++ b/ucb/JunitTest_ucb_unoapi.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_JunitTest_JunitTest,ucb_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,ucb_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,ucb_unoapi,\
$$(DEFS) \
commit 3b9a99ea731cd4d14d930634a3466588ca23419b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 14:32:06 2011 +0200
gnumake4: adjust configmgr to gbuild
diff --git a/configmgr/JunitTest_configmgr_unoapi.mk b/configmgr/JunitTest_configmgr_unoapi.mk
index 4887c50..a707909 100644
--- a/configmgr/JunitTest_configmgr_unoapi.mk
+++ b/configmgr/JunitTest_configmgr_unoapi.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\
$$(DEFS) \
commit 9019120d2792f2d4f8242c4701e3d97f3c8e9103
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jun 21 13:18:04 2011 +0200
gnumake4: postmerge fixes in formula
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index f1ac2c8..0477baf 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,for,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,for,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,for,\
-DFORMULA_DLLIMPLEMENTATION \
))
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index 0b77c70..5b849f9 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,forui,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,forui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,forui,\
-DFORMULA_DLLIMPLEMENTATION \
))
commit 57e9e0908d664bcf082a6d68faf39e1c95a0c274
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 13:24:12 2011 +0200
gnumake4: fix buildbreakers from merge
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 7aab083..5293778 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,drawinglayer,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,drawinglayer,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,drawinglayer,\
-DDRAWINGLAYER_DLLIMPLEMENTATION \
))
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 7665b91..51179c4 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -90,5 +90,4 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
framework/source/fwe/xml/xmlnamespaces \
))
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
# vim: set noet sw=4 ts=4:
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index a856cf7..da39f4d 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Executable_add_defs,svidl,\
$(eval $(call gb_Executable_add_linked_libs,svidl,\
tl \
sal \
- stl \
$(gb_STDLIBS) \
))
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index d97278d..00fcc94 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -45,18 +45,16 @@ $(eval $(call gb_Library_add_defs,lng,\
))
$(eval $(call gb_Library_add_linked_libs,lng,\
+ comphelper \
cppu \
cppuhelper \
- comphelper \
- vos3 \
- tl \
i18nisolang1 \
- svl \
- stl \
sal \
- xo \
+ svl \
+ tl \
ucbhelper \
utl \
+ xo \
$(gb_STDLIBS) \
))
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
index d3bb35c..d233475 100644
--- a/xmlscript/Library_xcr.mk
+++ b/xmlscript/Library_xcr.mk
@@ -43,10 +43,10 @@ $(eval $(call gb_Library_add_defs,xcr,\
))
$(eval $(call gb_Library_add_linked_libs,xcr,\
- sal \
+ comphelper \
cppu \
cppuhelper \
- stl \
+ sal \
$(gb_STDLIBS) \
))
commit bf1508f84daea84105fe622c1033da5ba1a02e75
Merge: c0afdcf... d8968a8...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jun 19 12:24:29 2011 +0200
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
diff --cc editeng/Library_editeng.mk
index 45683df,df11ba7..f5444d3
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@@ -153,8 -156,9 +154,8 @@@ $(eval $(call gb_Library_add_linked_lib
ucbhelper \
cppuhelper \
cppu \
- vos3 \
sal \
+ salhelper \
- icuuc \
i18nisolang1 \
i18npaper \
$(gb_STDLIBS) \
diff --cc framework/JunitTest_framework_complex.mk
index d7dba37,5865a6f..d7dba37
mode 100755,100644..100644
--- a/framework/JunitTest_framework_complex.mk
+++ b/framework/JunitTest_framework_complex.mk
diff --cc framework/JunitTest_framework_unoapi.mk
index 840d88c,e8dbe20..73d9ca1
mode 100755,100644..100644
--- a/framework/JunitTest_framework_unoapi.mk
+++ b/framework/JunitTest_framework_unoapi.mk
diff --cc framework/Library_fwe.mk
index 87dc9bf,6c87f86..7665b91
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@@ -92,4 -91,9 +90,5 @@@ $(eval $(call gb_Library_add_exception_
framework/source/fwe/xml/xmlnamespaces \
))
-#todo: ImageListDescriptor can't be exported completely without exporting everything
+ ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
-$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
-endif
-
# vim: set noet sw=4 ts=4:
diff --cc idl/prj/makefile.mk
index 88cd9df,0000000..88cd9df
mode 100644,000000..100755
--- a/idl/prj/makefile.mk
+++ b/idl/prj/makefile.mk
diff --cc linguistic/JunitTest_linguistic_unoapi.mk
index c663874,2036fef..c663874
mode 100644,100644..100755
--- a/linguistic/JunitTest_linguistic_unoapi.mk
+++ b/linguistic/JunitTest_linguistic_unoapi.mk
diff --cc linguistic/Module_linguistic.mk
index 045a6b9,4ed03ee..1c16516
--- a/linguistic/Module_linguistic.mk
+++ b/linguistic/Module_linguistic.mk
@@@ -27,19 -27,8 +27,19 @@@
$(eval $(call gb_Module_Module,linguistic))
+$(eval $(call gb_Module_add_targets,linguistic,\
+ Library_lng \
+ Package_inc \
+))
+
+#$(eval $(call gb_Module_add_check_targets,linguistic,\
+#))
+
$(eval $(call gb_Module_add_subsequentcheck_targets,linguistic,\
- JunitTest_linguistic_unoapi \
+ JunitTest_linguistic_unoapi \
))
-# vim: set noet ts=4 sw=4:
+# was disabled in old build system
+# JunitTest_linguistic_complex \
+
+# vim: set noet sw=4 ts=4:
diff --cc linguistic/Package_inc.mk
index 4c86bdd,0000000..4c86bdd
mode 100644,000000..100755
--- a/linguistic/Package_inc.mk
+++ b/linguistic/Package_inc.mk
diff --cc linguistic/inc/linguistic/hyphdta.hxx
index a976191,a79ae93..2c45ec0
--- a/linguistic/inc/linguistic/hyphdta.hxx
+++ b/linguistic/inc/linguistic/hyphdta.hxx
@@@ -135,16 -132,7 +132,12 @@@ public
sal_Int16 GetLanguage() { return nLanguage; }
void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; }
void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; }
+
+ static com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
+ (const ::rtl::OUString &rWord, sal_Int16 nLang,
+ const ::rtl::OUString &rHyphWord,
+ const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
};
-
-
- ///////////////////////////////////////////////////////////////////////////
-
} // namespace linguistic
#endif
diff --cc linguistic/inc/linguistic/lngdllapi.h
index 5b207d7,0000000..ea5849a
mode 100644,000000..100644
--- a/linguistic/inc/linguistic/lngdllapi.h
+++ b/linguistic/inc/linguistic/lngdllapi.h
@@@ -1,42 -1,0 +1,45 @@@
++/* -*- 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 INCLUDED_LNG_DLLAPI_H
+#define INCLUDED_LNG_DLLAPI_H
+
+#include "sal/config.h"
+#include "sal/types.h"
+
+#if defined LNG_DLLIMPLEMENTATION
+#define LNG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define LNG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#define LNG_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
++
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc linguistic/inc/linguistic/lngprophelp.hxx
index 6269559,a4abbb4..405b6a6
--- a/linguistic/inc/linguistic/lngprophelp.hxx
+++ b/linguistic/inc/linguistic/lngprophelp.hxx
@@@ -181,30 -180,6 +179,28 @@@ public
throw(::com::sun::star::uno::RuntimeException);
};
+class LNG_DLLPUBLIC PropertyHelper_Thesaurus
+{
+ PropertyHelper_Thes* pInst;
+ com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper;
+
+ // disallow use of copy-constructor and assignment-operator
+ PropertyHelper_Thesaurus( const PropertyHelper_Thes & );
+ PropertyHelper_Thesaurus & operator = ( const PropertyHelper_Thes & );
+
+public:
+ PropertyHelper_Thesaurus(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet );
+ ~PropertyHelper_Thesaurus();
+ void AddAsPropListener();
+ void RemoveAsPropListener();
+ void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+};
+
+
- ///////////////////////////////////////////////////////////////////////////
-
class PropertyHelper_Spell :
public PropertyChgHelper
{
@@@ -255,42 -230,6 +251,41 @@@ public
};
+class LNG_DLLPUBLIC PropertyHelper_Spelling
+{
+ PropertyHelper_Spell* pInst;
+ com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper;
+
+ // disallow use of copy-constructor and assignment-operator
+ PropertyHelper_Spelling( const PropertyHelper_Spell & );
+ PropertyHelper_Spelling & operator = ( const PropertyHelper_Spell & );
+
+public:
+ PropertyHelper_Spelling(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet );
+ ~PropertyHelper_Spelling();
+
+ void AddAsPropListener();
+ void RemoveAsPropListener();
+ void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+ sal_Int16 GetMaxNumberOfSuggestions() const;
+ sal_Bool IsSpellUpperCase() const;
+ sal_Bool IsSpellWithDigits() const;
+ sal_Bool IsSpellCapitalization() const;
+ sal_Bool addLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException);
+ sal_Bool removeLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException);
+};
+
- ///////////////////////////////////////////////////////////////////////////
+
class PropertyHelper_Hyphen :
public PropertyChgHelper
{
@@@ -335,41 -274,6 +330,39 @@@ public
sal_Int16 GetMinWordLength() const { return nResHyphMinWordLength; }
};
+class LNG_DLLPUBLIC PropertyHelper_Hyphenation
+{
+ PropertyHelper_Hyphen* pInst;
+ com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper;
+
+ // disallow use of copy-constructor and assignment-operator
+ PropertyHelper_Hyphenation( const PropertyHelper_Hyphen & );
+ PropertyHelper_Hyphenation & operator = ( const PropertyHelper_Hyphen & );
+
+public:
+ PropertyHelper_Hyphenation(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet);
+ ~PropertyHelper_Hyphenation();
+
+ void AddAsPropListener();
+ void RemoveAsPropListener();
+ void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+ sal_Int16 GetMinLeading() const;
+ sal_Int16 GetMinTrailing() const;
+ sal_Int16 GetMinWordLength() const;
+ sal_Bool addLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException);
+ sal_Bool removeLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException);
+};
+
- ///////////////////////////////////////////////////////////////////////////
-
} // namespace linguistic
#endif
diff --cc linguistic/inc/linguistic/misc.hxx
index 8313f25,23e4d58..ecf16f3
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@@ -93,9 -94,8 +94,8 @@@ namespace linguisti
#define DIC_ERR_UNKNOWN 3
#define DIC_ERR_NOT_EXISTS 4
- ///////////////////////////////////////////////////////////////////////////
-::osl::Mutex & GetLinguMutex();
+LNG_DLLPUBLIC ::osl::Mutex& GetLinguMutex();
LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang );
@@@ -162,16 -145,14 +145,14 @@@ sal_Bool FileExists( const String &r
/// @returns an URL for a new and writable dictionary rDicName.
/// The URL will point to the path given by 'GetDictionaryWriteablePath'
-String GetWritableDictionaryURL( const String &rDicName );
+LNG_DLLPUBLIC String GetWritableDictionaryURL( const String &rDicName );
// looks for the specified file in the list of paths.
- // In case of multiple occurences only the first found is returned.
+ // In case of multiple occurrences only the first found is returned.
String SearchFileInPaths( const String &rFile, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rPaths );
- ///////////////////////////////////////////////////////////////////////////
-
-sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos );
+LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos );
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord >
@@@ -179,10 -160,9 +160,9 @@@
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord );
- ///////////////////////////////////////////////////////////////////////////
-sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
-sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
+LNG_DLLPUBLIC sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
+LNG_DLLPUBLIC sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
inline sal_Bool IsUpper( const String &rText, sal_Int16 nLanguage ) { return IsUpper( rText, 0, rText.Len(), nLanguage ); }
inline sal_Bool IsLower( const String &rText, sal_Int16 nLanguage ) { return IsLower( rText, 0, rText.Len(), nLanguage ); }
@@@ -192,13 -172,12 +172,12 @@@ String ToUpper( const String &rTex
String ToTitle( const String &rText, sal_Int16 nLanguage );
sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage );
sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage );
-sal_Bool HasDigits( const ::rtl::OUString &rText );
-sal_Bool IsNumeric( const String &rText );
+LNG_DLLPUBLIC sal_Bool HasDigits( const ::rtl::OUString &rText );
+LNG_DLLPUBLIC sal_Bool IsNumeric( const String &rText );
- ///////////////////////////////////////////////////////////////////////////
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetOneInstanceService( const char *pServiceName );
-::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetLinguProperties();
+LNG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetLinguProperties();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > GetSearchableDictionaryList();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > GetDictionaryList();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList();
@@@ -226,10 -204,8 +204,8 @@@ LNG_DLLPUBLIC sal_uInt8 AddEntryToDic
const ::rtl::OUString &rRplcTxt, sal_Int16 nRplcLang,
sal_Bool bStripDot = sal_True );
-sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &xDicList );
+LNG_DLLPUBLIC sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &xDicList );
- ///////////////////////////////////////////////////////////////////////////
- //
// AppExitLstnr:
// virtual base class that calls it AtExit function when the application
// (ie the Desktop) is about to terminate
diff --cc linguistic/prj/build.lst
index cae9ac8,7ee07a2..3ef507e
--- a/linguistic/prj/build.lst
+++ b/linguistic/prj/build.lst
@@@ -1,2 -1,8 +1,2 @@@
- lg linguistic : svl xmloff ucbhelper vos comphelper ICU:icu LIBXSLT:libxslt NULL
+ lg linguistic : svl xmloff ucbhelper comphelper ICU:icu LIBXSLT:libxslt NULL
-lg linguistic usr1 - all lg_mkout NULL
-lg linguistic\prj get - all lg_prj NULL
-lg linguistic\inc nmake - all lg_inc NULL
-lg linguistic\source nmake - all lg_src lg_inc NULL
-
-# could be we need a Japanese office version
-# lg linguistic\qa\complex\linguistic nmake - all lg_qa_complex NULL
+lg linguistic\prj nmake - all lg_prj NULL
diff --cc linguistic/prj/makefile.mk
index 88cd9df,0000000..88cd9df
mode 100644,000000..100755
--- a/linguistic/prj/makefile.mk
+++ b/linguistic/prj/makefile.mk
diff --cc linguistic/source/hyphdta.cxx
index 25c58b9f,648e7cf..42363bf
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@@ -183,23 -181,6 +181,22 @@@ Sequence< sal_Int16 > SAL_CALL Possible
return aOrigHyphenPos;
}
+com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> HyphenatedWord::CreateHyphenatedWord(
+ const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+ const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos )
+{
+ return new HyphenatedWord( rWord, nLang, nHyphenationPos, rHyphenatedWord, nHyphenPos );
+}
+
+com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > PossibleHyphens::CreatePossibleHyphens
+ (const ::rtl::OUString &rWord, sal_Int16 nLang,
+ const ::rtl::OUString &rHyphWord,
+ const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions)
+{
+ return new PossibleHyphens( rWord, nLang, rHyphWord, rPositions );
+}
+
+
- ///////////////////////////////////////////////////////////////////////////
} // namespace linguistic
diff --cc linguistic/source/lngprophelp.cxx
index c0ed9fd,e1df74c..d5ae4fb
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@@ -711,162 -707,6 +707,161 @@@ void PropertyHelper_Hyphen::SetTmpPropV
}
}
+PropertyHelper_Thesaurus::PropertyHelper_Thesaurus(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet )
+{
+ pInst = new PropertyHelper_Thes( rxSource, rxPropSet );
+ xPropHelper = pInst;
+}
+
+PropertyHelper_Thesaurus::~PropertyHelper_Thesaurus()
+{
+}
+
+void PropertyHelper_Thesaurus::AddAsPropListener()
+{
+ pInst->AddAsPropListener();
+}
+
+void PropertyHelper_Thesaurus::RemoveAsPropListener()
+{
+ pInst->RemoveAsPropListener();
+}
+
+void PropertyHelper_Thesaurus::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals )
+{
+ pInst->SetTmpPropVals( rPropVals );
+}
+
+PropertyHelper_Hyphenation::PropertyHelper_Hyphenation(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet)
+{
+ pInst = new PropertyHelper_Hyphen( rxSource, rxPropSet );
+ xPropHelper = pInst;
+}
+
+PropertyHelper_Hyphenation::~PropertyHelper_Hyphenation()
+{
+}
+
+void PropertyHelper_Hyphenation::AddAsPropListener()
+{
+ pInst->AddAsPropListener();
+}
+
+void PropertyHelper_Hyphenation::RemoveAsPropListener()
+{
+ pInst->RemoveAsPropListener();
+}
+
+void PropertyHelper_Hyphenation::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals )
+{
+ pInst->SetTmpPropVals( rPropVals );
+}
+
+sal_Int16 PropertyHelper_Hyphenation::GetMinLeading() const
+{
+ return pInst->GetMinLeading();
+}
+
+sal_Int16 PropertyHelper_Hyphenation::GetMinTrailing() const
+{
+ return pInst->GetMinTrailing();
+}
+
+sal_Int16 PropertyHelper_Hyphenation::GetMinWordLength() const
+{
+ return pInst->GetMinWordLength();
+}
+
+sal_Bool PropertyHelper_Hyphenation::addLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException)
+{
+ return pInst->addLinguServiceEventListener( rxListener );
+}
+
+sal_Bool PropertyHelper_Hyphenation::removeLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException)
+{
+ return pInst->removeLinguServiceEventListener( rxListener );
+}
+
+PropertyHelper_Spelling::PropertyHelper_Spelling(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet )
+{
+ pInst = new PropertyHelper_Spell( rxSource, rxPropSet );
+ xPropHelper = pInst;
+}
+
+PropertyHelper_Spelling::~PropertyHelper_Spelling()
+{
+}
+
+void PropertyHelper_Spelling::AddAsPropListener()
+{
+ pInst->AddAsPropListener();
+}
+
+void PropertyHelper_Spelling::RemoveAsPropListener()
+{
+ pInst->RemoveAsPropListener();
+}
+
+void PropertyHelper_Spelling::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals )
+{
+ pInst->SetTmpPropVals( rPropVals );
+}
+
+sal_Int16 PropertyHelper_Spelling::GetMaxNumberOfSuggestions() const
+{
+ return pInst->GetMaxNumberOfSuggestions();
+}
+
+sal_Bool PropertyHelper_Spelling::IsSpellUpperCase() const
+{
+ return pInst->IsSpellUpperCase();
+}
+
+sal_Bool PropertyHelper_Spelling::IsSpellWithDigits() const
+{
+ return pInst->IsSpellWithDigits();
+}
+
+sal_Bool PropertyHelper_Spelling::IsSpellCapitalization() const
+{
+ return pInst->IsSpellCapitalization();
+}
+
+sal_Bool PropertyHelper_Spelling::addLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException)
+{
+ return pInst->addLinguServiceEventListener( rxListener );
+}
+
+sal_Bool PropertyHelper_Spelling::removeLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException)
+{
+ return pInst->removeLinguServiceEventListener( rxListener );
+}
+
+
- ///////////////////////////////////////////////////////////////////////////
} // namespace linguistic
diff --cc linguistic/source/spelldta.cxx
index dcd8a4b,63b4b94..9b3a4e4
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@@ -360,17 -359,6 +359,16 @@@ void SpellAlternatives::SetAlternatives
}
+com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > SpellAlternatives::CreateSpellAlternatives(
+ const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt )
+{
+ SpellAlternatives* pAlt = new SpellAlternatives;
+ pAlt->SetWordLanguage( rWord, nLang );
+ pAlt->SetFailureType( nTypeP );
+ pAlt->SetAlternatives( rAlt );
+ return Reference < XSpellAlternatives >(pAlt);
+}
+
- ///////////////////////////////////////////////////////////////////////////
} // namespace linguistic
diff --cc sfx2/JunitTest_sfx2_unoapi.mk
index f7fdfae,33602a0..f7fdfae
mode 100644,100755..100755
--- a/sfx2/JunitTest_sfx2_unoapi.mk
+++ b/sfx2/JunitTest_sfx2_unoapi.mk
diff --cc sfx2/Library_qstart.mk
index ab8ced2,0709f60..c775d21
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@@ -69,8 -71,7 +68,6 @@@ $(eval $(call gb_Library_add_linked_lib
ucbhelper \
utl \
vcl \
- vos3 \
- eggtray \
- xml2 \
sfx \
))
diff --cc sfx2/Library_sfx.mk
index 68fca07,c93efac..bb57c4d
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@@ -72,7 -73,7 +71,6 @@@ $(eval $(call gb_Library_add_linked_lib
ucbhelper \
utl \
vcl \
- vos3 \
- xml2 \
$(gb_STDLIBS) \
))
diff --cc sfx2/Package_inc.mk
index 6ecf5f3,5731762..6ecf5f3
mode 100644,100755..100755
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
diff --cc sfx2/inc/sfx2/qswin32.h
index 479ddfd,0000000..3c992a0
mode 100644,000000..100644
--- a/sfx2/inc/sfx2/qswin32.h
+++ b/sfx2/inc/sfx2/qswin32.h
@@@ -1,49 -1,0 +1,51 @@@
++/* -*- 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 _QSWIN32_H
+#define _QSWIN32_H
+
+#define QUICKSTART_CLASSNAMEA "SO Listener Class"
+#define QUICKSTART_WINDOWNAMEA "SO Listener Window"
+#define SHUTDOWN_QUICKSTART_MESSAGEA "SO KillTray"
+
+#define QUICKSTART_CLASSNAMEW L##QUICKSTART_CLASSNAMEA
+#define QUICKSTART_WINDOWNAMEW L##QUICKSTART_WINDOWNAMEA
+#define SHUTDOWN_QUICKSTART_MESSAGEW L##SHUTDOWN_QUICKSTART_MESSAGEA
+
+#ifdef UNICODE
+# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEW
+# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEW
+# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEW
+#else
+# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEA
+# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEA
+# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEA
- #endif
+
+#endif /* _QSWIN32_H */
++
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc sfx2/prj/build.lst
index dbc233c,32f90ba..1cf56d7
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@@ -1,2 -1,3 +1,2 @@@
- sf sfx2 : L10N:l10n idl basic xmlscript framework readlicense_oo shell sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL
-sf sfx2 : TRANSLATIONS:translations idl basic xmlscript framework readlicense_oo shell setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
++sf sfx2 : TRANSLATIONS:translations idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
sf sfx2\prj nmake - all sf_prj NULL
-
diff --cc svx/JunitTest_svx_unoapi.mk
index a8b90a3,2db815c..d94858b
mode 100755,100644..100644
--- a/svx/JunitTest_svx_unoapi.mk
+++ b/svx/JunitTest_svx_unoapi.mk
diff --cc vbahelper/Library_vbahelper.mk
index 380b0d0,3b78599..45691f8
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@@ -56,10 -57,8 +56,9 @@@ $(eval $(call gb_Library_add_linked_lib
sal \
sb \
sfx \
- stl \
svl \
svt \
+ svxcore \
tk \
tl \
utl \
diff --cc xmlscript/Module_xmlscript.mk
index 30fa314,0000000..30fa314
mode 100644,000000..100755
--- a/xmlscript/Module_xmlscript.mk
+++ b/xmlscript/Module_xmlscript.mk
diff --cc xmlscript/Package_dtd.mk
index cab5ddd,0000000..cab5ddd
mode 100644,000000..100755
--- a/xmlscript/Package_dtd.mk
+++ b/xmlscript/Package_dtd.mk
diff --cc xmlscript/Package_inc.mk
index 649dde7,0000000..649dde7
mode 100644,000000..100755
--- a/xmlscript/Package_inc.mk
+++ b/xmlscript/Package_inc.mk
diff --cc xmlscript/inc/xmlscript/xcrdllapi.h
index a0994d5,0000000..6745cee
mode 100644,000000..100644
--- a/xmlscript/inc/xmlscript/xcrdllapi.h
+++ b/xmlscript/inc/xmlscript/xcrdllapi.h
@@@ -1,43 -1,0 +1,45 @@@
++/* -*- 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 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XCRdllapi.h,v $
+ * $Revision: 1.4 $
+ *
+ * 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 INCLUDED_XCRDLLAPI_H
+#define INCLUDED_XCRDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(XCR_DLLIMPLEMENTATION)
+#define XCR_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define XCR_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define XCR_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc xmlscript/inc/xmlscript/xmldlg_imexp.hxx
index 58560e1,47d0d17..86b98c1
--- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
@@@ -27,21 -28,15 +28,15 @@@
#ifndef _XMLSCRIPT_XMLDLG_IMEXP_HXX_
#define _XMLSCRIPT_XMLDLG_IMEXP_HXX_
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HXX_
+ #include <com/sun/star/frame/XModel.hpp>
+
#include <com/sun/star/container/XNameContainer.hpp>
- #endif
- #ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
- #endif
- #ifndef _COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HXX_
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HXX_
#include <com/sun/star/uno/XComponentContext.hpp>
- #endif
#include "xmlscript/xmlns.h"
-
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
@@@ -75,9 -76,9 +76,9 @@@ SAL_CALL exportDialogModel
SAL_THROW( (::com::sun::star::uno::Exception) );
//==============================================================================
-void SAL_CALL importDialogModel(
+XCR_DLLPUBLIC void SAL_CALL importDialogModel(
::com::sun::star::uno::Reference<
- ::com::sun::star::io::XInputStream > xInput,
+ ::com::sun::star::io::XInputStream > const & xInput,
::com::sun::star::uno::Reference<
::com::sun::star::container::XNameContainer > const & xDialogModel,
::com::sun::star::uno::Reference<
diff --cc xmlscript/prj/makefile.mk
index 88cd9df,0000000..88cd9df
mode 100644,000000..100755
--- a/xmlscript/prj/makefile.mk
+++ b/xmlscript/prj/makefile.mk
diff --cc xmlscript/source/inc/xml_import.hxx
index f0e7387,0000000..94a0ef1
mode 100644,000000..100644
--- a/xmlscript/source/inc/xml_import.hxx
+++ b/xmlscript/source/inc/xml_import.hxx
@@@ -1,65 -1,0 +1,68 @@@
++/* -*- 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.
+ *
+ ************************************************************************/
+#if ! defined _XMLSCRIPT_XML_IMPORT_HXX_
+#define _XMLSCRIPT_XML_IMPORT_HXX_
+
+#include "com/sun/star/xml/input/XRoot.hpp"
+#include "com/sun/star/xml/sax/XExtendedDocumentHandler.hpp"
+
+namespace xmlscript
+{
+
+/*##############################################################################
+
+ IMPORTING
+
+##############################################################################*/
+
+/** Creates a document handler to be used for SAX1 parser that can handle
+ namespaces. Namespace URI are mapped to integer ids for performance.
+ Implementing the XImporter interface, you will get a startRootElement()
+ for the root element of your XML document and subsequent
+ startChildElement() callbacks for each sub element.
+ Namespaces of tags are identified by their integer value.
+
+ @param xRoot
+ initial object being called for root context
+ @param bSingleThreadedUse
+ flag whether context management is synchronized.
+ @return
+ document handler for parser
+*/
+::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
+SAL_CALL createDocumentHandler(
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::xml::input::XRoot > const & xRoot,
+ bool bSingleThreadedUse = true )
+ SAL_THROW( () );
+
+}
+
+#endif
++
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c0afdcf645e29a0c422ffa940d732af4e2c1d36a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jun 18 14:12:17 2011 +0200
fixing rebase errors
diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx
index 2ef17e3..80f8f75 100644
--- a/linguistic/inc/linguistic/spelldta.hxx
+++ b/linguistic/inc/linguistic/spelldta.hxx
@@ -118,14 +118,13 @@ public:
// XSetSpellAlternatives
virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException);
- static com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives(
- const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
// non-interface specific functions
void SetWordLanguage(const ::rtl::OUString &rWord, sal_Int16 nLang);
void SetFailureType(sal_Int16 nTypeP);
- void SetAlternatives(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
+ void SetAlternatives( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
+ static com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives(
+ const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
};
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index 6e13fe6..dbc233c 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,3 +1,2 @@
sf sfx2 : L10N:l10n idl basic xmlscript framework readlicense_oo shell sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL
sf sfx2\prj nmake - all sf_prj NULL
-
commit f42eec764ee7c34b11cb3816b1ea3ada6b5d213e
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Apr 15 17:27:06 2011 +0000
gnumake4: vbahelper: link svxcore [hg:1dabf718a032]
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index 5475b21..380b0d0 100755
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,vbahelper,\
stl \
svl \
svt \
+ svxcore \
tk \
tl \
utl \
commit 68b5951c3bfd6869559351336e582705362a1a29
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Apr 15 17:27:06 2011 +0000
gnumake4: svx: fix dependency [hg:785e1d99fe08]
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 5769a7f..8c5ec29 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,svxcore))
$(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
-$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots))
+$(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
$(eval $(call gb_Library_add_package_headers,svxcore,\
svx_inc \
commit 0c8ae0ac97c7c77c34207c63f430a669a13bdabd
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date: Wed Feb 2 13:51:09 2011 +0100
meged from outgoing [hg:e7087a952a92]
diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk
deleted file mode 100644
index 38a6cf7..0000000
--- a/framework/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = framework
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/framework/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk
deleted file mode 100644
index b53a04e..0000000
--- a/sfx2/qa/cppunit/makefile.mk
+++ /dev/null
@@ -1,86 +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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ=../..
-PRJNAME=sfx2
-TARGET=qa_cppunit
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-# --- Libs ---------------------------------------------------------
-
-SHL1OBJS= \
- $(SLO)/test_metadatable.obj \
-
-
-SHL1STDLIBS= \
- $(CPPUNITLIB) \
- $(SALLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(VCLLIB) \
- $(SFXLIB) \
-
-
-SHL1TARGET= test_metadatable
-SHL1RPATH = NONE
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= version.map
-
-# --- All object files ---------------------------------------------
-
-SLOFILES= \
- $(SHL1OBJS) \
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
-
-.END
diff --git a/sfx2/qa/unoapi/makefile.mk b/sfx2/qa/unoapi/makefile.mk
deleted file mode 100644
index ea91ba4..0000000
--- a/sfx2/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = sfx2
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/sfx2/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
commit 08cd54907c12da3b42abd66ea2997c9b60bbaf8d
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Thu Apr 14 10:11:15 2011 +0200
gnumake4: added dbaccess and reportdesign [hg:a75d5667430f]
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 43ae4a9..26d8352 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -44,13 +44,13 @@ extern "C"
{
//---------------------------------------------------------------------------------------
- void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/)
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/)
{
*_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//---------------------------------------------------------------------------------------
-void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
{
void* pRet = NULL;
commit 1cd16db2052a9a3ad45c7598e449cd1c1f1bdb9c
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Mon Apr 11 15:09:46 2011 +0200
gnumake4: remove evoab [hg:0109ce6e2910]
diff --git a/connectivity/source/drivers/evoab/LCatalog.cxx b/connectivity/source/drivers/evoab/LCatalog.cxx
deleted file mode 100644
index cae0a86..0000000
--- a/connectivity/source/drivers/evoab/LCatalog.cxx
+++ /dev/null
@@ -1,72 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
-
-
-#include "LCatalog.hxx"
-#include "LConnection.hxx"
-#include "LTables.hxx"
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::container;
-
-// -------------------------------------------------------------------------
-using namespace connectivity::evoab;
-// -------------------------------------------------------------------------
-OEvoabCatalog::OEvoabCatalog(OEvoabConnection* _pCon) : file::OFileCatalog(_pCon)
-{
-}
-// -------------------------------------------------------------------------
-void OEvoabCatalog::refreshTables()
-{
- TStringVector aVector;
- Sequence< ::rtl::OUString > aTypes;
- Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- ::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
-
- if(xResult.is())
- {
- Reference< XRow > xRow(xResult,UNO_QUERY);
- while(xResult->next())
- aVector.push_back(xRow->getString(3));
- }
- if(m_pTables)
- m_pTables->reFill(aVector);
- else
- m_pTables = new OEvoabTables(m_xMetaData,*this,m_aMutex,aVector);
-}
-// -----------------------------------------------------------------------------
-
-
-
diff --git a/connectivity/source/drivers/evoab/LCatalog.hxx b/connectivity/source/drivers/evoab/LCatalog.hxx
deleted file mode 100644
index f0e2e86..0000000
--- a/connectivity/source/drivers/evoab/LCatalog.hxx
+++ /dev/null
@@ -1,49 +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.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_EVOAB_LCATALOG_HXX_
-#define _CONNECTIVITY_EVOAB_LCATALOG_HXX_
-
-#include "file/FCatalog.hxx"
-
-namespace connectivity
-{
- namespace evoab
- {
- class OEvoabConnection;
- class OEvoabCatalog : public file::OFileCatalog
- {
- public:
- virtual void refreshTables();
-
- public:
- OEvoabCatalog(OEvoabConnection* _pCon);
- };
- }
-}
-#endif // _CONNECTIVITY_EVOAB_LCATALOG_HXX_
-
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
deleted file mode 100644
index bf2564e..0000000
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ /dev/null
@@ -1,232 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
-#include "LColumnAlias.hxx"
-#include "LDriver.hxx"
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include "LConfigAccess.hxx"
-
-using namespace ::connectivity;
-using namespace ::connectivity::evoab;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
-
-static const ::rtl::OUString sProgrammaticNames[] =
-{
- ::rtl::OUString::createFromAscii("FirstName"),
- ::rtl::OUString::createFromAscii("LastName"),
- ::rtl::OUString::createFromAscii("DisplayName"),
- ::rtl::OUString::createFromAscii("NickName"),
- ::rtl::OUString::createFromAscii("PrimaryEmail"),
- ::rtl::OUString::createFromAscii("SecondEmail"),
- ::rtl::OUString::createFromAscii("PreferMailFormat"),
- ::rtl::OUString::createFromAscii("WorkPhone"),
- ::rtl::OUString::createFromAscii("HomePhone"),
- ::rtl::OUString::createFromAscii("FaxNumber"),
- ::rtl::OUString::createFromAscii("PagerNumber"),
- ::rtl::OUString::createFromAscii("CellularNumber"),
- ::rtl::OUString::createFromAscii("HomeAddress"),
- ::rtl::OUString::createFromAscii("HomeAddress2"),
- ::rtl::OUString::createFromAscii("HomeCity"),
- ::rtl::OUString::createFromAscii("HomeState"),
- ::rtl::OUString::createFromAscii("HomeZipCode"),
- ::rtl::OUString::createFromAscii("HomeCountry"),
- ::rtl::OUString::createFromAscii("WorkAddress"),
- ::rtl::OUString::createFromAscii("WorkAddress2"),
- ::rtl::OUString::createFromAscii("WorkCity"),
- ::rtl::OUString::createFromAscii("WorkState"),
- ::rtl::OUString::createFromAscii("WorkZipCode"),
- ::rtl::OUString::createFromAscii("WorkCountry"),
- ::rtl::OUString::createFromAscii("JobTitle"),
- ::rtl::OUString::createFromAscii("Department"),
- ::rtl::OUString::createFromAscii("Company"),
- ::rtl::OUString::createFromAscii("WebPage1"),
- ::rtl::OUString::createFromAscii("WebPage2"),
- ::rtl::OUString::createFromAscii("BirthYear"),
- ::rtl::OUString::createFromAscii("BirthMonth"),
- ::rtl::OUString::createFromAscii("BirthDay"),
- ::rtl::OUString::createFromAscii("Notes")
-};
-//------------------------------------------------------------------------------
-OColumnAlias::OColumnAlias()
-{
- // Initialise m_aAlias with the default values from sProgrammaticNames.
- initialise();
-
- // Initialise m_aAlias map with the default values from sProgrammaticNames.
- setAliasMap();
-}
-//------------------------------------------------------------------
-OColumnAlias::~OColumnAlias()
-{
-}
-//------------------------------------------------------------------
-void OColumnAlias::initialise()
-{
- m_aAlias.reserve( END - FIRSTNAME + 1 );
- for (sal_Int32 i(FIRSTNAME); i < END; ++i)
- {
- m_aAlias.push_back(sProgrammaticNames[i]);
- m_aHeadLineNames.push_back(sProgrammaticNames[i]);
- }
-
- return;
-}
-//------------------------------------------------------------------
-void OColumnAlias::setAlias(const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory >& _rxORB)
-{
- OSL_TRACE("OColumnAlias::setAlias()entered");
-
- // open our driver settings config node
-
- // the config path for our own driver's settings
- Reference< XPropertySet > xEvoDriverNode = createDriverConfigNode( _rxORB, OEvoabDriver::getImplementationName_Static() );
- //Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, mozab::OConnection::getDriverImplementationName() );
- Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, ::rtl::OUString::createFromAscii ("com.sun.star.comp.sdbc.MozabDriver") );
- if ( xEvoDriverNode.is() && xMozDriverNode.is() )
- {
- try
- {
- //=============================================================
- Reference< XNameAccess > xEvoAliasesNode;
- Reference< XNameAccess > xMozAliasesNode;
- xEvoDriverNode->getPropertyValue( ::rtl::OUString::createFromAscii("ColumnAliases") ) >>= xEvoAliasesNode;
- xMozDriverNode->getPropertyValue( ::rtl::OUString::createFromAscii("ColumnAliases") ) >>= xMozAliasesNode;
- OSL_ENSURE( xEvoAliasesNode.is(), "OColumnAlias::setAlias: missing the evolution aliases node!" );
- OSL_ENSURE( xMozAliasesNode.is(), "OColumnAlias::setAlias: missing the mozilla aliases node!" );
-
- // this is a set of string nodes
- Sequence< ::rtl::OUString > aColumnProgrammaticNames;
- //OSL_TRACE("OColumnAlias::setAlias()before xAliasesNode->getElementNames()");
- if ( xEvoAliasesNode.is() )
- aColumnProgrammaticNames = xEvoAliasesNode->getElementNames();
- //OSL_TRACE("OColumnAlias::setAlias()after xAliasesNode->getElementNames()");
-
- //=============================================================
- // travel through all the set elements
- const ::rtl::OUString* pProgrammaticNames = aColumnProgrammaticNames.getConstArray();
- const ::rtl::OUString* pProgrammaticNamesEnd = pProgrammaticNames + aColumnProgrammaticNames.getLength();
- ::rtl::OUString sAssignedAlias;
- ::rtl::OUString sHeadLineName;
-
- for ( ; pProgrammaticNames < pProgrammaticNamesEnd; ++pProgrammaticNames )
- {
- //OSL_TRACE("OColumnAlias::setAlias()::*pProgrammaticNames = %s\n", ((OUtoCStr(*pProgrammaticNames)) ? (OUtoCStr(*pProgrammaticNames)):("NULL")) );
- OSL_ENSURE( m_aAliasMap.end() != m_aAliasMap.find( *pProgrammaticNames ),
- "OColumnAlias::setAlias: found an invalid programmtic name!" );
- // if this asserts, somebody stored a programmatic name in the configuration
- // which is not allowed (i.e. not in the list of known programmatics).
- //OSL_TRACE("OColumnAlias::setAlias()before xAliasesNode->getByName()");
-
-#if OSL_DEBUG_LEVEL > 0
- sal_Bool bExtractionSuccess =
-#endif
- xMozAliasesNode->getByName( *pProgrammaticNames) >>= sAssignedAlias;
- OSL_ENSURE( bExtractionSuccess, "OColumnAlias::setAlias: invalid mozilla config data!" );
-#if OSL_DEBUG_LEVEL > 0
- bExtractionSuccess =
-#endif
- xEvoAliasesNode->getByName( *pProgrammaticNames) >>= sHeadLineName;
- OSL_ENSURE( bExtractionSuccess, "OColumnAlias::setAlias: invalid evolution config data!" );
- //OSL_TRACE("OColumnAlias::setAlias()after xAliasesNode->getByName()");
-
- // normalize in case the config data is corrupted
- // (what we really don't need is an empty alias ...)
- if ( 0 == sAssignedAlias.getLength() )
- sAssignedAlias = *pProgrammaticNames;
- if ( 0 == sHeadLineName.getLength() )
- sHeadLineName = *pProgrammaticNames;
- //OSL_TRACE("OColumnAlias::setAlias()::sAssignedAlias = %s\n", ((OUtoCStr(sAssignedAlias)) ? (OUtoCStr(sAssignedAlias)):("NULL")) );
- //OSL_TRACE("OColumnAlias::setAlias()::sHeadLineName = %s\n", ((OUtoCStr(sHeadLineName)) ? (OUtoCStr(sHeadLineName)):("NULL")) );
-
- //=============================================================
- // check the value
- // look up the programmatic indicated by pProgrammaticNames in the known programmatics
- const ::rtl::OUString* pProgrammatic = sProgrammaticNames + FIRSTNAME;
- const ::rtl::OUString* pProgrammaticEnd = sProgrammaticNames + END;
-
- OSL_ENSURE( (sal_Int32)m_aAlias.size() == pProgrammaticEnd - pProgrammatic,
- "OColumnAlias::setAlias: aliases vector not yet initialized!" );
-
- // the destination where we want to remember the alias
- ::std::vector< ::rtl::OUString >::iterator aAlias = m_aAlias.begin();
- ::std::vector< ::rtl::OUString >::iterator aHeadLineName = m_aHeadLineNames.begin();
-
- for ( ; pProgrammatic < pProgrammaticEnd; ++pProgrammatic, ++aAlias, ++aHeadLineName )
- {
- //OSL_TRACE("OColumnAlias::setAlias()::*pProgrammatic = %s\n", ((OUtoCStr(*pProgrammatic)) ? (OUtoCStr(*pProgrammatic)):("NULL")) );
- if ( pProgrammaticNames->equals( *pProgrammatic ) )
- {
- // add alias to the vector
- *aAlias = sAssignedAlias;
- *aHeadLineName = sHeadLineName;
- break;
- }
- }
- }
- }
- catch( const Exception& )
- {
- OSL_ENSURE( sal_False, "OColumnAlias::setAlias: could not read my driver's configuration data!" );
- }
- }
-
- // Initialise m_aAliasMap.
- setAliasMap();
-
- return;
-}
-//------------------------------------------------------------------
-const ::std::vector< ::rtl::OUString> & OColumnAlias::getAlias() const
-{
- return m_aAlias;
-}
-//------------------------------------------------------------------
-const ::std::map< ::rtl::OUString, ::rtl::OUString> & OColumnAlias::getAliasMap() const
-{
- return m_aAliasMap;
-}
-//------------------------------------------------------------------
-void OColumnAlias::setAliasMap()
-{
- // Fill the map with the values of m_aAlias
- // and the sProgrammaticNames array.
- for (sal_Int32 i(FIRSTNAME); i < END; ++i) {
- m_aAliasMap[m_aAlias[i]] = m_aHeadLineNames[i];
- //OSL_TRACE("OColumnAlias::setAliasMap()::m_aAlias[i] = %s\n", ((OUtoCStr(m_aAlias[i])) ? (OUtoCStr(m_aAlias[i])):("NULL")) );
- //OSL_TRACE("OColumnAlias::setAliasMap()::m_aAliasMap[m_aAlias[i]] = %s\n", ((OUtoCStr(m_aAliasMap[m_aAlias[i]])) ? (OUtoCStr(m_aAliasMap[m_aAlias[i]])):("NULL")) );
- }
-
- return;
-}
-//------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.hxx b/connectivity/source/drivers/evoab/LColumnAlias.hxx
deleted file mode 100644
index 57257f7..0000000
--- a/connectivity/source/drivers/evoab/LColumnAlias.hxx
+++ /dev/null
@@ -1,113 +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.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_EVOAB_LCOLUMNALIAS_HXX_
-#define _CONNECTIVITY_EVOAB_LCOLUMNALIAS_HXX_
-
-#include <unotools/confignode.hxx>
-
-#include <osl/mutex.hxx>
-#include <vector>
-#include <map>
-
-namespace connectivity
-{
- namespace evoab
- {
- typedef enum {
- FIRSTNAME = 0,
- LASTNAME,
- DISPLAYNAME,
- NICKNAME,
- PRIMARYEMAIL,
- SECONDEMAIL,
- PREFERMAILFORMAT,
- WORKPHONE,
- HOMEPHONE,
- FAXNUMBER,
- PAGERNUMBER,
- CELLULARNUMBER,
- HOMEADDRESS,
- HOMEADDRESS2,
- HOMECITY,
- HOMESTATE,
- HOMEZIPCODE,
- HOMECOUNTRY,
- WORKADDRESS,
- WORKADDRESS2,
- WORKCITY,
- WORKSTATE,
- WORKZIPCODE,
- WORKCOUNTRY,
- JOBTITLE,
- DEPARTMENT,
- COMPANY,
- WEBPAGE1,
- WEBPAGE2,
- BIRTHYEAR,
- BIRTHMONTH,
- BIRTHDAY,
- NOTES,
- END
- } ProgrammaticName;
-
- class OColumnAlias
- {
- /**
- * m_Alias holds aliases for the evolution addressbook
- * column names. This member gets initialised during
- * creation of the connection to the driver.
- * m_aAlias initialises m_aAliasMap which then can be
- * used to find the corresponding programmatic name
- * when an alias is used as a query attribute. Mozilla
- * expects programmatic names from its clients.
- *
- * m_aAlias: vector of aliases used to initialise m_aAliasMap.
- * m_AliasMap: map of {alias, programmaticname} pairs.
- *
- */
- private:
- ::std::vector< ::rtl::OUString> m_aAlias;
- ::std::vector< ::rtl::OUString> m_aHeadLineNames;
- ::std::map< ::rtl::OUString, ::rtl::OUString> m_aAliasMap;
- protected:
- ::osl::Mutex m_aMutex;
- public:
- void initialise(void);
- const ::std::vector< ::rtl::OUString> & getAlias(void) const;
- const ::std::map< ::rtl::OUString, ::rtl::OUString> & getAliasMap(void) const;
- void setAlias(const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory > &);
- private:
- void setAliasMap(void);
- public:
- OColumnAlias(void);
- ~OColumnAlias(void);
- };
- }
-}
-#endif // _CONNECTIVITY_EVOAB_LCOLUMNALIAS_HXX_
diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx
deleted file mode 100644
index 87cd192..0000000
--- a/connectivity/source/drivers/evoab/LColumns.cxx
+++ /dev/null
@@ -1,57 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
-
-#include "LColumns.hxx"
-#include "LTable.hxx"
-#include "connectivity/sdbcx/VColumn.hxx"
-
-using namespace connectivity::evoab;
-using namespace connectivity;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::container;
-
-
-sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName)
-{
-
- OEvoabTable* pTable = (OEvoabTable*)m_pTable;
- ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns();
- OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()));
- sdbcx::ObjectType xRet;
- if(aIter != aCols->get().end())
- xRet = sdbcx::ObjectType(*aIter,UNO_QUERY);
- return xRet;
-}
-// -------------------------------------------------------------------------
-
-
diff --git a/connectivity/source/drivers/evoab/LColumns.hxx b/connectivity/source/drivers/evoab/LColumns.hxx
deleted file mode 100644
index 57ee63d..0000000
--- a/connectivity/source/drivers/evoab/LColumns.hxx
+++ /dev/null
@@ -1,52 +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.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_EVOAB_LCOLUMNS_HXX_
-#define _CONNECTIVITY_EVOAB_LCOLUMNS_HXX_
-
-#include "file/FColumns.hxx"
-
-namespace connectivity
-{
- namespace evoab
- {
- class OEvoabColumns : public file::OColumns
- {
- protected:
- virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
- public:
- OEvoabColumns(file::OFileTable* _pTable,
- ::osl::Mutex& _rMutex,
- const TStringVector &_rVector
- ) : file::OColumns(_pTable,_rMutex,_rVector)
- {}
-
- };
- }
-}
-#endif // _CONNECTIVITY_EVOAB_LCOLUMNS_HXX_
-
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
deleted file mode 100644
index 28a1a05..0000000
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ /dev/null
@@ -1,161 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
-#include "LConfigAccess.hxx"
-#include "LDriver.hxx"
-#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
-#include "LDebug.hxx"
-#endif
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-
-//.........................................................................
-namespace connectivity
-{
- namespace evoab
- {
- //-----------------------------------------------------------------
- Reference< XPropertySet > createDriverConfigNode( Reference< XMultiServiceFactory > _rxORB, ::rtl::OUString _sDriverImplementationName )
- {
- OSL_TRACE("createDriverConfigNode()entered");
-
- Reference< XPropertySet > xNode;
- try
- {
- //=============================================================
- // create the config provider
- Reference< XMultiServiceFactory > xConfigProvider(
- _rxORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ) ),
- UNO_QUERY
- );
- OSL_ENSURE( xConfigProvider.is(), "createDriverConfigNode: could not create the config provider!" );
-
- if ( xConfigProvider.is() )
- {
- ::rtl::OUString sCompleteNodePath = ::rtl::OUString::createFromAscii ("/org.openoffice.Office.DataAccess/DriverSettings/" );
- sCompleteNodePath += _sDriverImplementationName;
- //sCompleteNodePath += OEvoabConnection::getDriverImplementationName();
- //sCompleteNodePath += ::rtl::OUString::createFromAscii ("com.sun.star.comp.sdbc.MozabDriver");
- EVO_TRACE_STRING("createDriverConfigNode()::sCompleteNodePath = %s\n", sCompleteNodePath );
-
- //=========================================================
- // arguments for creating the config access
- Sequence< Any > aArguments(2);
- // the path to the node to open
- aArguments[0] <<= PropertyValue(
- ::rtl::OUString::createFromAscii( "nodepath"),
- 0,
- makeAny( sCompleteNodePath ),
- PropertyState_DIRECT_VALUE
- );
- // the depth: -1 means unlimited
- aArguments[1] <<= PropertyValue(
- ::rtl::OUString::createFromAscii( "depth"),
- 0,
- makeAny( (sal_Int32)-1 ),
- PropertyState_DIRECT_VALUE
- );
-
- //=========================================================
- // create the access
- Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" ),
- aArguments
- );
- OSL_ENSURE( xAccess.is(), "createDriverConfigNode: invalid access returned (should throw an exception instead)!" );
-
- xNode = xNode.query( xAccess );
- }
- }
- catch( const Exception& )
- {
- OSL_ENSURE( sal_False, "createDriverConfigNode: caught an exception while accessing the driver's config node!" );
- }
-
- // outta here
- return xNode;
- }
-
- //-----------------------------------------------------------------
- namespace
- {
- // a private helper to accessing the point where we store the reference
- // to the factory
- Reference< XMultiServiceFactory >& accessFactoryStorage( )
- {
- static Reference< XMultiServiceFactory > xEvoabServiceFactory;
- return xEvoabServiceFactory;
- }
- }
-
- //-----------------------------------------------------------------
- void setEvoabServiceFactory( const Reference< XMultiServiceFactory >& _rxFactory )
- {
- accessFactoryStorage( ) = _rxFactory;
- }
-
- //-----------------------------------------------------------------
- const Reference< XMultiServiceFactory >& getEvoabServiceFactory( )
- {
- return accessFactoryStorage( );
- }
-
- //-----------------------------------------------------------------
- ::rtl::OUString getFullPathExportingCommand( Reference< XMultiServiceFactory > _rxORB )
- {
- ::rtl::OUString sFullPathExportingCommand;
-
- //Reference< XMultiServiceFactory > xFactory = getEvoabServiceFactory();
- //OSL_ENSURE( xFactory.is(), "getPreferredProfileName: invalid service factory!" );
- OSL_ENSURE( _rxORB.is(), "getFullPathExportingCommand: invalid service factory!" );
- if ( _rxORB.is() )
- {
- try
- {
- Reference< XPropertySet > xDriverNode = createDriverConfigNode( _rxORB, OEvoabDriver::getImplementationName_Static() );
- Reference< XPropertySet > xEvoPrefsNode;
- if ( xDriverNode.is() )
- xDriverNode->getPropertyValue( ::rtl::OUString::createFromAscii( "EvolutionPreferences" ) ) >>= xEvoPrefsNode;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list