incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1394707 [2/4] - in /incubator/ooo/branches/buildsys: ext_libraries/apr-util/ ext_libraries/serf/win/ main/ main/UnoControls/prj/ main/accessibility/prj/ main/animations/prj/ main/basctl/source/dlged/ main/basebmp/inc/basebmp/ main/basic/pr...
Date Fri, 05 Oct 2012 18:23:26 GMT
Modified: incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/panel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/panel.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/panel.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/panel.cxx Fri Oct  5 18:23:17 2012
@@ -37,7 +37,7 @@
 
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespace

Modified: incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/panelmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/panelmanager.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/panelmanager.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/panelmanager.cxx Fri Oct  5 18:23:17 2012
@@ -42,7 +42,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <vcl/svapp.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespace

Modified: incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx Fri Oct  5 18:23:17 2012
@@ -42,7 +42,7 @@
 
 // other includes
 #include <unotools/cmdoptions.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <vcl/i18nhelp.hxx>

Modified: incubator/ooo/branches/buildsys/main/framework/source/loadenv/loadenv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/loadenv/loadenv.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/loadenv/loadenv.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/loadenv/loadenv.cxx Fri Oct  5 18:23:17 2012
@@ -93,7 +93,7 @@
 #include <vcl/syswin.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <unotools/moduleoptions.hxx>
 #include <svtools/sfxecode.hxx>

Modified: incubator/ooo/branches/buildsys/main/framework/source/services/frame.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/services/frame.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/services/frame.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/services/frame.cxx Fri Oct  5 18:23:17 2012
@@ -94,7 +94,7 @@
 #include <vcl/svapp.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>

Modified: incubator/ooo/branches/buildsys/main/framework/source/services/taskcreatorsrv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/services/taskcreatorsrv.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/services/taskcreatorsrv.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/services/taskcreatorsrv.cxx Fri Oct  5 18:23:17 2012
@@ -52,7 +52,7 @@
 #include <vcl/svapp.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/window.hxx>
 

Modified: incubator/ooo/branches/buildsys/main/framework/source/tabwin/tabwindow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/tabwin/tabwindow.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/tabwin/tabwindow.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/tabwin/tabwindow.cxx Fri Oct  5 18:23:17 2012
@@ -48,7 +48,7 @@
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/sequenceashashmap.hxx>
 

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/addonstoolbarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/addonstoolbarmanager.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/addonstoolbarmanager.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/addonstoolbarmanager.cxx Fri Oct  5 18:23:17 2012
@@ -83,7 +83,7 @@
 #include <svtools/imgdef.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 #include <svtools/miscopt.hxx>

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/addonstoolbarwrapper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/addonstoolbarwrapper.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/addonstoolbarwrapper.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/addonstoolbarwrapper.cxx Fri Oct  5 18:23:17 2012
@@ -57,7 +57,7 @@
 //_________________________________________________________________________________________________________________
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/langselectionstatusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/langselectionstatusbarcontroller.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/langselectionstatusbarcontroller.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/langselectionstatusbarcontroller.cxx Fri Oct  5 18:23:17 2012
@@ -32,13 +32,10 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
-#endif
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/convert.hxx>
 
 #include <com/sun/star/frame/XPopupMenuController.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/awt/PopupMenuDirection.hpp>
 #include <svtools/langtab.hxx>
 #include "sal/types.h"
@@ -60,7 +57,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include <toolkit/unohlp.hxx>
 #include <tools/gen.hxx>
 #include <com/sun/star/awt/Command.hpp>
 #include <svl/languageoptions.hxx>

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/logoimagestatusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/logoimagestatusbarcontroller.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/logoimagestatusbarcontroller.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/logoimagestatusbarcontroller.cxx Fri Oct  5 18:23:17 2012
@@ -32,7 +32,7 @@
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/helper/convert.hxx>
 

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/logotextstatusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/logotextstatusbarcontroller.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/logotextstatusbarcontroller.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/logotextstatusbarcontroller.cxx Fri Oct  5 18:23:17 2012
@@ -32,7 +32,7 @@
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/helper/convert.hxx>
 

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/menubarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/menubarmanager.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/menubarmanager.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/menubarmanager.cxx Fri Oct  5 18:23:17 2012
@@ -81,7 +81,7 @@
 #include <unotools/cmdoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/panelwrapper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/panelwrapper.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/panelwrapper.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/panelwrapper.cxx Fri Oct  5 18:23:17 2012
@@ -50,7 +50,7 @@
 //	other includes
 //_________________________________________________________________________________________________________________
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/miscopt.hxx>

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/popupmenucontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/popupmenucontroller.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/popupmenucontroller.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/popupmenucontroller.cxx Fri Oct  5 18:23:17 2012
@@ -28,7 +28,6 @@
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
-//#include <toolkit/unohlp.hxx>
 
 #include <rtl/ref.hxx>
 

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/simpletextstatusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/simpletextstatusbarcontroller.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/simpletextstatusbarcontroller.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/simpletextstatusbarcontroller.cxx Fri Oct  5 18:23:17 2012
@@ -32,7 +32,7 @@
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/helper/convert.hxx>
 

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/statusbarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/statusbarmanager.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/statusbarmanager.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/statusbarmanager.cxx Fri Oct  5 18:23:17 2012
@@ -59,7 +59,7 @@
 //_________________________________________________________________________________________________________________
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <svtools/statusbarcontroller.hxx>
 

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/statusbarwrapper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/statusbarwrapper.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/statusbarwrapper.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/statusbarwrapper.cxx Fri Oct  5 18:23:17 2012
@@ -52,7 +52,7 @@
 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 #include <tools/solar.h>

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarmanager.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarmanager.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarmanager.cxx Fri Oct  5 18:23:17 2012
@@ -81,7 +81,7 @@
 #include <svtools/toolboxcontroller.hxx>
 #include <unotools/cmdoptions.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/mediadescriptor.hxx>
 #include <svtools/miscopt.hxx>

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarsmenucontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarsmenucontroller.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarsmenucontroller.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarsmenucontroller.cxx Fri Oct  5 18:23:17 2012
@@ -68,7 +68,7 @@
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/window.hxx>
 #include <svtools/menuoptions.hxx>

Modified: incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarwrapper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarwrapper.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarwrapper.cxx (original)
+++ incubator/ooo/branches/buildsys/main/framework/source/uielement/toolbarwrapper.cxx Fri Oct  5 18:23:17 2012
@@ -56,7 +56,7 @@
 //_________________________________________________________________________________________________________________
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>

Modified: incubator/ooo/branches/buildsys/main/hwpfilter/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/hwpfilter/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/hwpfilter/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/hwpfilter/prj/build.lst Fri Oct  5 18:23:17 2012
@@ -1,4 +1,4 @@
-hw	hwpfilter	:	offuh cppuhelper comphelper ZLIB:zlib LIBXSLT:libxslt NULL
+hw	hwpfilter	:	offapi cppuhelper comphelper ZLIB:zlib LIBXSLT:libxslt NULL
 hw	hwpfilter							usr1	-	all	hw_mkout NULL
 hw	hwpfilter\prj						get		-	all	hw_prj NULL
 hw	hwpfilter\inc						nmake	-	all	hw_inc NULL

Modified: incubator/ooo/branches/buildsys/main/i18nutil/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/i18nutil/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/i18nutil/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/i18nutil/prj/build.lst Fri Oct  5 18:23:17 2012
@@ -1,3 +1,3 @@
-inu  i18nutil    :   sal cppu offuh NULL
+inu  i18nutil    :   sal cppu offapi NULL
 inu  i18nutil                                   usr1    -   all inu_mkout NULL
 inu  i18nutil\source\utility                    nmake   -   all inu_utility NULL

Modified: incubator/ooo/branches/buildsys/main/jvmaccess/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/jvmaccess/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/jvmaccess/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/jvmaccess/prj/build.lst Fri Oct  5 18:23:17 2012
@@ -1,4 +1,4 @@
-jv jvmaccess : offuh ridljar cppu sal salhelper NULL
+jv jvmaccess : offapi ridljar cppu sal salhelper NULL
 jv jvmaccess usr1 - all jv_mkout NULL
 jv jvmaccess\source nmake - all jv_source NULL
 jv jvmaccess\util nmake - all jv_util jv_source NULL

Modified: incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/lngprophelp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/lngprophelp.hxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/lngprophelp.hxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/lngprophelp.hxx Fri Oct  5 18:23:17 2012
@@ -199,6 +199,39 @@ public:
 };
 
 
+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);
+};
+
 ///////////////////////////////////////////////////////////////////////////
 
 class PropertyHelper_Spell :
@@ -286,6 +319,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_Hyphen :
@@ -365,6 +420,41 @@ public:
 			throw(::com::sun::star::uno::RuntimeException);
 };
 
+
+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);
+};
+
 ///////////////////////////////////////////////////////////////////////////
 
 }   // namespace linguistic

Modified: incubator/ooo/branches/buildsys/main/linguistic/source/hyphdta.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/source/hyphdta.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/source/hyphdta.cxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/source/hyphdta.cxx Fri Oct  5 18:23:17 2012
@@ -195,6 +195,22 @@ com::sun::star::uno::Reference < com::su
 }
 
 
+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

Modified: incubator/ooo/branches/buildsys/main/linguistic/source/lngprophelp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/source/lngprophelp.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/source/lngprophelp.cxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/source/lngprophelp.cxx Fri Oct  5 18:23:17 2012
@@ -557,6 +557,161 @@ sal_Int16 PropertyHelper_Spell::GetDefau
     return 16;
 }
 
+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 );
+}
+
+		
 ///////////////////////////////////////////////////////////////////////////
 
 static const char *aHP[] =

Modified: incubator/ooo/branches/buildsys/main/linguistic/source/spelldta.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/source/spelldta.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/source/spelldta.cxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/source/spelldta.cxx Fri Oct  5 18:23:17 2012
@@ -366,6 +366,16 @@ com::sun::star::uno::Reference < com::su
     return Reference < XSpellAlternatives >(pAlt);
 }
 
+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

Modified: incubator/ooo/branches/buildsys/main/mysqlc/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/mysqlc/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/mysqlc/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/mysqlc/prj/build.lst Fri Oct  5 18:23:17 2012
@@ -1,3 +1,3 @@
-mc	mysqlc	:	solenv offuh cppu soltools cppuhelper readlicense_oo NULL
+mc	mysqlc	:	solenv offapi cppu soltools cppuhelper readlicense_oo NULL
 ch	mysqlc              usr1    -	all mc_mkout NULL
 mc	mysqlc\source       nmake   -   all mc_source NULL

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl Fri Oct  5 18:23:17 2012
@@ -67,8 +67,6 @@ interface XTargetPropertiesCreator : ::c
 
 //============================================================================= 
 
-service TargetPropertiesCreator: XTargetPropertiesCreator;
- 
 }; }; }; };  
 
 #endif

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl Fri Oct  5 18:23:17 2012
@@ -206,10 +206,6 @@ interface XDatabaseDataProvider
 	[attribute,bound] string DataSourceName;
 }; 
  
-service DatabaseDataProvider : XDatabaseDataProvider
-{
-    createWithConnection([in] com::sun::star::sdbc::XConnection connection);
-};
 //============================================================================= 
  
  }; }; }; };  };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/SlideSorter.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/SlideSorter.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/SlideSorter.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/SlideSorter.idl Fri Oct  5 18:23:17 2012
@@ -42,92 +42,12 @@
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
+#ifndef __com_sun_star_drawing_XSlideSorterBase_idl__
+#include <com/sun/star/drawing/XSlideSorterBase.idl>
+#endif
 
 module com {  module sun {  module star {  module drawing {
 
-/** This interface exists only because services do not directly support
-    multiple inheritance and attributes.
-    <p>It provides the interfaces and attributes that every object that
-    implements the <type>SlideSorter</type> service.</p>
-*/
-interface XSlideSorterBase
-{
-    /** This interface is included to mark a <type>SlideSorter</type> object
-        as view of the drawing framework and to provide a
-        <type>ResourceId</type>.
-    */
-    interface ::com::sun::star::drawing::framework::XView;
-
-    /** The <type>XDrawView</type> interface is included to provide access
-        to the current slide (especially write access).
-    */
-    interface ::com::sun::star::drawing::XDrawView;
-
-    /** The set of slides that are displayed by the implementing object.
-        <p>The default value is the set of all slides of the document for
-        which a slide sorter is created.</p>
-    */
-    [attribute] ::com::sun::star::container::XIndexAccess DocumentSlides;
-
-    /** Set this flag to <TRUE/> in order to have the current slide
-        highlighted.
-        <p>The default value is <FALSE/>.</p>
-    */
-    [attribute] boolean IsHighlightCurrentSlide;
-
-    /** Set this flag to <TRUE/> in order to visualize the selection of
-        slides (typically a bold frame around the selected slides).
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsShowSelection;
-
-    /** Set this flag to <TRUE/> to visualize to where the focus is by
-        showing a dotted rectangle around the focused slide.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsShowFocus;
-
-    /** When this flag has the value <TRUE/> then every time the current
-        slide is changed the visual area is shifted so that the new current
-        slide is display in the center of the slide sorter window.
-        <p>It is not always possible to move the current slide into the
-        exact center of the window, for example when slides are located near
-        the start or end of a document.</p>
-        <p>The default value is <FALSE/>.
-    */
-    [attribute] boolean IsCenterSelection;
-
-    /** This flag controls whether updates of previews are created during
-        full screen presentations (<FALSE/>) or not (<TRUE/>).  The
-        suspension of preview creations is an optimization for not slowing
-        down a running presentation.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsSuspendPreviewUpdatesDuringFullScreenPresentation;
-
-    /** The orientation of a slide sorter can be either vertical (<TRUE/>)
-        or horizontal (<FALSE/>).
-    */
-    [attribute] boolean IsOrientationVertical;
-
-    /** This flag is a hint to make scrolling look smooth.
-    */
-    [attribute] boolean IsSmoothScrolling;
-
-    [attribute] ::com::sun::star::util::Color BackgroundColor;
-    [attribute] ::com::sun::star::util::Color TextColor;
-    [attribute] ::com::sun::star::util::Color SelectionColor;
-    [attribute] ::com::sun::star::util::Color HighlightColor;
-
-    /** This flag controls whether the model can be modified by using
-        keyboard or mouse.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsUIReadOnly;
-};
-
-
-
 
 /** A slide sorter shows previews for a set of slides, typically all slides
     in a document, and allows the selection, reordering, creation, and

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/XPresenterHelper.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/XPresenterHelper.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/XPresenterHelper.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/XPresenterHelper.idl Fri Oct  5 18:23:17 2012
@@ -36,15 +36,12 @@
 #ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
 #endif
+#ifndef __com_sun_star_drawing_CanvasFeature_idl__
+#include <com/sun/star/drawing/CanvasFeature.idl>
+#endif
 
 module com { module sun { module star { module drawing {
 
-constants CanvasFeature
-{
-    const short None = 0;
-    const short SpriteCanvas = 1;
-};
-
 /** This interface is a collection of functions that are necessary to
     implement larger parts of the presenter screen as extension.  The
     methods of this interface give access to services that can, at the

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl Fri Oct  5 18:23:17 2012
@@ -39,28 +39,12 @@
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
 #endif
+#ifndef __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
+#include <com/sun/star/drawing/XSlidePreviewCacheListener.idl>
+#endif
 
 module com { module sun { module star { module drawing {
 
-/** Listener for asynchronous preview creations.  Called when a slide
-    preview has been created that was previously requested via a call to
-    <method>XSlidePreviewCache::getSlidePreview()</method>.  The
-    implementor may then call <method>getSlidePreview()</method> a second
-    time to get the up-to-date version of the preview.
-*/
-published interface XSlidePreviewCacheListener
-{
-    /** Called by a <interface>XSlidePreviewCache</interface> object when a
-        preview has been created for the slide with the given index.
-        @param nSlideIndex
-            The index of the slide for which a new preview has been created.
-    */
-    void notifyPreviewCreation ([in] long nSlideIndex);
-};
-
-
-
-
 /** A cache of preview bitmaps for the slides of one Impress or Draw
     document in one size.  There may be more than one cache for one
     document.  These are internally connected and for missing previews one

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl Fri Oct  5 18:23:17 2012
@@ -33,20 +33,12 @@
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
 #endif
+#ifndef __com_sun_star_rendering_drawing_framework_BorderType_idl__
+#include <com/sun/star/drawing/framework/BorderType.idl>
+#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-/** See XPaneBorderPainter and its addBorder() and removeBorder() methods
-    for an explanation of the border type and its values.
-*/
-published enum BorderType
-{
-    INNER_BORDER,
-    OUTER_BORDER,
-    TOTAL_BORDER
-};
-
-
 /** Paint the border around a rectangular region, typically a pane.
 
     <p>Calling objects have to be able to derive inner bounding boxs of the

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/frame/XUntitledNumbers.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/frame/XUntitledNumbers.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/frame/XUntitledNumbers.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/frame/XUntitledNumbers.idl Fri Oct  5 18:23:17 2012
@@ -35,11 +35,6 @@
 
  module com {  module sun {  module star {  module frame {
 
-constants UntitledNumbersConst
-{
-    const long INVALID_NUMBER = 0;
-};
- 
 //=============================================================================
 /** knows all currently used and all free numbers for using with untitled
     but counted objects.

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/inspection/XStringRepresentation.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/inspection/XStringRepresentation.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/inspection/XStringRepresentation.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/inspection/XStringRepresentation.idl Fri Oct  5 18:23:17 2012
@@ -59,11 +59,6 @@ published interface XStringRepresentatio
                         ) raises( com::sun::star::uno::Exception );
 };
 
-service StringRepresentation : XStringRepresentation
-{
-    create([in]com::sun::star::script::XTypeConverter TypeConverter)raises( com::sun::star::lang::IllegalArgumentException );
-    createConstant([in]com::sun::star::script::XTypeConverter TypeConverter,[in] string Constant,[in] sequence<string> Values)raises( com::sun::star::lang::IllegalArgumentException );
-};
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/presentation/XSlideShow.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/presentation/XSlideShow.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/presentation/XSlideShow.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/presentation/XSlideShow.idl Fri Oct  5 18:23:17 2012
@@ -365,8 +365,6 @@ interface XSlideShow : ::com::sun::star:
 
 };
 
-service SlideShow : XSlideShow;
-
 }; }; }; };
 
 #endif

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/presentation/XTransitionFactory.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/presentation/XTransitionFactory.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/presentation/XTransitionFactory.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/presentation/XTransitionFactory.idl Fri Oct  5 18:23:17 2012
@@ -80,8 +80,6 @@ interface XTransitionFactory : ::com::su
                                   [in] com::sun::star::rendering::XBitmap    enteringBitmap );
 };
 
-service TransitionFactory : XTransitionFactory;
-
 }; }; }; };
 
 #endif

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl Fri Oct  5 18:23:17 2012
@@ -35,9 +35,6 @@
 #ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
 #endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
-#include <com/sun/star/rendering/XBitmap.idl>
-#endif
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
 #endif
@@ -125,23 +122,6 @@ published interface XBitmapCanvas : XCan
 
 };
 
-//=============================================================================
-
-// TODO: Multiple-inheritance interfaces
-
-/** This service provides the interfaces for a <type>XBitmapCanvas</type>
- */
-service BitmapCanvas
-{
-    /** Canvas interface, to issue rendering operations.
-     */
-    interface XBitmapCanvas;
-
-    /** Bitmap interface, to directly manipulate the pixel.
-     */
-    interface XBitmap;
-};
-
 }; }; }; };
 
 #endif

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XCanvas.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XCanvas.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XCanvas.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XCanvas.idl Fri Oct  5 18:23:17 2012
@@ -730,11 +730,6 @@ published interface XCanvas : ::com::sun
     XGraphicDevice			getDevice();
 };
 
-//=============================================================================
-
-/// Service providing an <type>XCanvas</type> interface
-service Canvas: XCanvas;
-
 }; }; }; };
 
 #endif

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XColorSpace.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XColorSpace.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XColorSpace.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/rendering/XColorSpace.idl Fri Oct  5 18:23:17 2012
@@ -35,47 +35,18 @@
 #ifndef __com_sun_star_rendering_ColorProfile_idl__
 #include <com/sun/star/rendering/ColorProfile.idl>
 #endif
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#include <com/sun/star/rendering/ColorComponent.idl>
+#endif
+#ifndef __com_sun_star_rendering_RGBColor_idl__
+#include <com/sun/star/rendering/RGBColor.idl>
+#endif
+#ifndef __com_sun_star_rendering_ARGBColor_idl__
+#include <com/sun/star/rendering/ARGBColor.idl>
+#endif
 
 module com { module sun { module star { module rendering {
 
-/// Shorthand for the device-dependent color components, and easier to read
-published typedef double ColorComponent;
-published typedef sequence<ColorComponent> Color;
-
-//=============================================================================
-
-/// RGB color triplet
-published struct RGBColor
-{
-    /// Red component. Valid range is [0,1.0]
-    ColorComponent Red;
-    /// Green component. Valid range is [0,1.0]
-    ColorComponent Green;
-    /// Blue component. Valid range is [0,1.0]
-    ColorComponent Blue;
-};
-
-//=============================================================================
-
-/// ARGB color quad
-published struct ARGBColor
-{
-    /** Alpha component.<p>
-
-        Valid range is [0,1.0], with 0.0 denoting fully transparent,
-        and 1.0 fully opaque.
-     */
-    ColorComponent Alpha;
-    /// Red component. Valid range is [0,1.0]
-    ColorComponent Red;
-    /// Green component. Valid range is [0,1.0]
-    ColorComponent Green;
-    /// Blue component. Valid range is [0,1.0]
-    ColorComponent Blue;
-};
-
-//=============================================================================
-
 /** Information how to interpret certain color data.<p>
 
     This interface encapsulates all information that is necessary to

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFixedLine.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFixedLine.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFixedLine.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFixedLine.idl Fri Oct  5 18:23:17 2012
@@ -93,7 +93,6 @@ published interface XFixedLine
     //-------------------------------------------------------------------------
 };
 
-published service FixedLine : XFixedLine;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFixedText.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFixedText.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFixedText.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFixedText.idl Fri Oct  5 18:23:17 2012
@@ -40,7 +40,6 @@ published interface XFixedText
     [attribute,bound] string Label;
 };
 
-published service FixedText : XFixedText;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFormatCondition.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFormatCondition.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFormatCondition.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFormatCondition.idl Fri Oct  5 18:23:17 2012
@@ -50,7 +50,6 @@ published interface XFormatCondition
     [attribute,bound] string Formula;
 };
 
-service FormatCondition : XFormatCondition;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFormattedField.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFormattedField.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFormattedField.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFormattedField.idl Fri Oct  5 18:23:17 2012
@@ -57,7 +57,6 @@ published interface XFormattedField
     [attribute,bound] com::sun::star::util::XNumberFormatsSupplier FormatsSupplier;
 };
 
-published service FormattedField : XFormattedField;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFunction.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFunction.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFunction.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XFunction.idl Fri Oct  5 18:23:17 2012
@@ -76,10 +76,6 @@ published interface XFunction
     [attribute,bound] com::sun::star::beans::Optional<string> InitialFormula;
 };
 
-service Function : XFunction
-{
-    create();
-};
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XGroup.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XGroup.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XGroup.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XGroup.idl Fri Oct  5 18:23:17 2012
@@ -134,7 +134,6 @@ published interface XGroup
     [attribute,bound] boolean ResetPageNumber;
 };
 
-service Group : XGroup;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XGroups.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XGroups.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XGroups.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XGroups.idl Fri Oct  5 18:23:17 2012
@@ -71,7 +71,6 @@ published interface XGroups
     [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
 };
 
-service Groups : XGroups;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XImageControl.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XImageControl.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XImageControl.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XImageControl.idl Fri Oct  5 18:23:17 2012
@@ -77,7 +77,6 @@ published interface XImageControl
     [attribute,bound] boolean PreserveIRI;
 };
 
-published service ImageControl : XImageControl;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportControlFormat.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportControlFormat.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportControlFormat.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportControlFormat.idl Fri Oct  5 18:23:17 2012
@@ -602,7 +602,6 @@ published interface XReportControlFormat
     };
 };
 
-service ReportControlFormat : XReportControlFormat;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportControlModel.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportControlModel.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportControlModel.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportControlModel.idl Fri Oct  5 18:23:17 2012
@@ -100,7 +100,6 @@ published interface XReportControlModel
     };
 };
 
-service ReportControlModel : XReportControlModel;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportDefinition.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportDefinition.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportDefinition.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XReportDefinition.idl Fri Oct  5 18:23:17 2012
@@ -347,7 +347,6 @@ published interface XReportDefinition
     };
 };
 
-published service ReportDefinition : XReportDefinition;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XSection.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XSection.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XSection.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XSection.idl Fri Oct  5 18:23:17 2012
@@ -180,7 +180,6 @@ published interface XSection
     [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
 };
 
-service Section : XSection;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XShape.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XShape.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XShape.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/report/XShape.idl Fri Oct  5 18:23:17 2012
@@ -81,7 +81,6 @@ published interface XShape
     [attribute,bound] boolean Opaque;
 };
 
-service Shape : XShape;
 //=============================================================================
 
 }; }; }; };

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/setup/InstallResponse.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/setup/InstallResponse.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/setup/InstallResponse.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/setup/InstallResponse.idl Fri Oct  5 18:23:17 2012
@@ -23,18 +23,10 @@
 #ifndef __com_sun_star_setup_InstallResponse_idl__ 
 #define __com_sun_star_setup_InstallResponse_idl__ 
  
+#include <com/sun/star/setup/ResponseErrorCode.idl>
+
 module com {  module sun {  module star {  module setup { 
 	 
-/// @deprecated
-published enum ResponseErrorCode
-{ 
-	// DocMerge: empty anyway
-	NOERROR, 
-		
-	// DocMerge: empty anyway
-	NOT_ENOUGH_SPACE 
-	}; 
- 
 // DocMerge: empty anyway
 published struct InstallResponse
 {

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl Fri Oct  5 18:23:17 2012
@@ -141,10 +141,6 @@ published interface XFormulaOpCodeMapper
 
 //=============================================================================
 
-service FormulaOpCodeMapper : XFormulaOpCodeMapper;
-
-//=============================================================================
-
 }; }; }; };
 
 #endif

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/sync/SyncInfo.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/sync/SyncInfo.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/sync/SyncInfo.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/sync/SyncInfo.idl Fri Oct  5 18:23:17 2012
@@ -27,13 +27,14 @@
 #ifndef __com_sun_star_sync_SyncScheme_idl__ 
 #include <com/sun/star/sync/SyncScheme.idl> 
 #endif 
+#ifndef __com_sun_star_sync_FilterData_idl__
+#include <com/sun/star/sync/FilterData.idl>
+#endif
  
 //============================================================================= 
  
 module com {  module sun {  module star {  module sync {  
  
-published typedef sequence< string > FilterData; 
- 
 //============================================================================= 
  
 /// @deprecated

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/util/XTextSearch.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/util/XTextSearch.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/util/XTextSearch.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/util/XTextSearch.idl Fri Oct  5 18:23:17 2012
@@ -27,7 +27,8 @@
 
 #include <com/sun/star/lang/Locale.idl>
 #include <com/sun/star/uno/XInterface.idl>
-//#include <com/sun/star/lang/CascadeTransliterator.idl>
+#include <com/sun/star/util/SearchOptions.idl>
+#include <com/sun/star/util/SearchResult.idl>
 
 //=============================================================================
 
@@ -35,181 +36,6 @@ module com { module sun { module star { 
 
 //=============================================================================
 
-
-published enum SearchAlgorithms
-{
-    /// Literal
-    ABSOLUTE,   // implemented as a kind of Boyer-Moore
-    /// Regular expression
-    REGEXP,
-    /// Weighted Levenshtein Distance
-    APPROXIMATE
-};
-
-/// Flags for search methods
-published constants SearchFlags
-{
-    /**
-        @deprecated The constant ALL_IGNORE_CASE is never supported - use
-                    <const scope="com::sun::star::i18n">TransliterationModules::IGNORE_CASE</const> 
-                    with 
-                    <member>SearchOptions::transliterateFlags</member> 
-                    instead.
-
-        @see <type scope="com::sun::star::i18n">TransliterationModules</type> 
-    */
-    const long  ALL_IGNORE_CASE     = 0x00000001;
-
-    /** Flag for normal (Boyer-Moore) search / Search for word only. */
-    const long  NORM_WORD_ONLY      = 0x00000010;
-
-    /** Flag for "regular expression" search / Interpret as extended 
-        regular expression.
-
-        @deprecated The flag is currently not supported by OOo.
-    */
-    const long  REG_EXTENDED        = 0x00000100;
-
-    /** Flag for "regular expression" search / No register information 
-        or backreferences, i.e., avoid sub expressions. Return only 
-        true/false if matched or not.
-
-        @deprecated The flag is currently not supported by OOo.
-    */
-    const long  REG_NOSUB           = 0x00000200;
-
-    /** Flag for "regular expression" search / Special new line 
-        treatment.
-
-        @deprecated The flag is currently not supported by OOo.
-
-        <p> A NEWLINE character in string will not be matched by a 
-        period outside bracket expression or by any form of a non 
-        matching list. </p>
-
-        <p> A circumflex (^) in pattern when used to specify expression 
-        anchoring will match the zero length string immediately after a 
-        newline in string, regardless of the setting of 
-        REG_NOT_BEGINOFLINE. </p>
-
-        <p> A dollar-sign ($) in pattern when used to specify expression 
-        anchoring, will match zero-length string immediately before a 
-        new line in string, regardless of the setting of 
-        REG_NOT_ENDOFLINE. </p>
-    */
-    const long  REG_NEWLINE         = 0x00000400;
-
-    /** The first character in the string is not the beginning of the 
-        line therefore ^ will not match with first character of the 
-        string.
-    */
-    const long  REG_NOT_BEGINOFLINE = 0x00000800;
-
-    /** The last character in the string is not the end of the line 
-        therefore $ will not match with last character of the string. 
-    */
-    const long  REG_NOT_ENDOFLINE   = 0x00001000;
-
-    /** Flag for "Weighted Levenshtein Distance" search / Relaxed 
-        checking of limit, split weigh pools.
-
-        <p> If not specified (<b>strict</b>), the search is sucessful if 
-        the WLD is within a calculated limit where each insertion, 
-        deletion and replacement adds a weight to a common pool of 
-        weights. This is the mathematically correct WLD. </p>
-
-        <p> From a user's point of view the strict WLD is an 
-        exclusive-OR of the arguments given, for example if allowed 
-        insertions=2 and allowed replacements=2, the search fails if 2 
-        characters had been inserted and an additional operation would 
-        be needed to match. Depending on the weights it may also fail if 
-        1 character was inserted and 1 character replaced and an 
-        additional operation would be needed to match. The strict 
-        algorithm may match less than expected from a first glance of 
-        the specified arguments, but does not return false positives. </p>
-
-        <p> If specified (<b>relaxed</b>), the search is also successful 
-        if the combined pool for insertions and deletions is below a 
-        doubled calculated limit and replacements are treated 
-        differently. Additionally, swapped characters are counted as one 
-        replacement. </p>
-
-        <p> From a user's point of view the relaxed WLD is an 
-        inclusive-OR of the arguments given, for example if allowed 
-        insertions=2 and allowed replacements=2, the search succeeds if 
-        2 characters had been inserted and an additional replacement is 
-        needed to match. The relaxed algorithm may return false 
-        positives, but meets user expectation better. </p>
-    */
-    const long  LEV_RELAXED     = 0x00010000;
-};
-
-
-published  struct SearchOptions  {
-	//-------------------------------------------------------------------------
-    /** search type */
-	SearchAlgorithms	algorithmType;
-
-	/** some flags - can be mixed
-
-		@see <type>SearchFlags</type>
-	*/
-	long 			searchFlag;
-
-    /** The text or pattern to be searched. */
-	string			searchString;
-
-    /** The replacement text
-        (is for optional replacing - SearchOption is only the data container for it) */
-	string			replaceString;
-
-    /** The locale for case insensitive search. */
-	::com::sun::star::lang::Locale  Locale;
-
-    /** This many characters can be different (as a replacement) between 
-        the found word and the search pattern in a "Weighted Levenshtein 
-        Distance" search. */
-	long			changedChars;
-
-    /** This many characters can be missing in the found word in a 
-        "Weighted Levenshtein Distance" search. */
-	long			deletedChars;
-
-    /** This many characters can be additional in the found word in a 
-        "Weighted Levenshtein Distance" search. */
-	long			insertedChars;
-
-    /** Flags for the transliteration. Same meaning as the enum of
-        <type scope="com::sun::star::i18n">TransliterationModules</type>
-	*/
-	long			transliterateFlags;
-};
-
-
-published  struct SearchResult  {
-	//-------------------------------------------------------------------------
-	/** Number of subexpressions,
-	if it is 0, then no match found; this value is 1 for ABSOLUTE and APPROXIMATE match.
-	The start and endOffset are always dependent on the search direction.
-	For example:
-	if you search "X" in the text "-X-" the offset are:
-		for forward: 	start = 1, end = 2
-        for backward:   start = 2, end = 1
-    Forward, the startOffset is inclusive, the endOffset exclusive.
-    Backward, the startOffset is exclusive, the endOffset inclusive.
-
-	For regular expressions it can be greater than 1.
-	If the value is 1, startoffset[0] and endoffset[0] points to the matching sub string
-	if value is > 1, still startoffset[0] and endoffset[0] points to the matching substring for whole regular expression
-	startoffset[i] and endoffset[i] points to the matching substring of i th matching substring.
-	*/
-	long subRegExpressions;
-	sequence<long> startOffset;		// inclusive
-	sequence<long> endOffset;  		// exclusive
-};
-
-
-
 /** enables an object to search in its content.
  */
 published interface XTextSearch : com::sun::star::uno::XInterface

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl Fri Oct  5 18:23:17 2012
@@ -31,31 +31,11 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#include <com/sun/star/xml/crypto/sax/ElementStackItem.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
 /**
- * A struct to keep a startElement/endElement SAX event.
- */
-struct ElementStackItem
-{
-	/**
-	 * whether it is a startElement event
-	 */
-	boolean isStartElementEvent;
-	
-	/**
-	 * the name of the element
-	 */
-	string elementName;
-	
-	/**
-	 * attribute list for a startElement event
-	 */
-	com::sun::star::xml::sax::XAttributeList xAttributes;
-}; 
-
-/**
  * Manipulate the "key SAX events" in a SAX event stream.
  *
  * @see   XSecController

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl Fri Oct  5 18:23:17 2012
@@ -31,53 +31,13 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl>
+#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkType.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
 /**
- * Represents the undefined security id
- */
-constants ConstOfSecurityId
-{
-	const long UNDEFINEDSECURITYID = -1;
-};
-
-/**
- * Defines priority for the element mark's notification.
- * <p>
- * The PRI_MINIMUM priority is a value less than any practical
- * priority value, it is used when compare between different
- * priority values.
- * <p>
- * The PRI_AFTERMODIFY priority represents the notification will be 
- * sent after any internal modification has finished.
- * <p>
- * The PRI_BEFOREMODIFY proirity represents the notification will be
- * sent before any internal modification happens.
- * <p>
- * So an element mark with PRI_BEFOREMODIFY will be handled first,
- * and one with PRI_AFTERMODIFY will be handled at last.
- */
-enum ElementMarkPriority
-{
-	MINIMUM = 1,
-	AFTERMODIFY,
-	BEFOREMODIFY
-};
-
-/**
- * Defines types of element mark.
- * <p>
- * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
- * type represents a element collector.
- */
-enum ElementMarkType
-{
-	ELEMENTMARK = 1,
-	ELEMENTCOLLECTOR
-};
-
-/**
  * Interface of Security SAX Event Keeper.
  * <p>
  * This interface is an extension of the XSAXEventKeeper interface,

Modified: incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl (original)
+++ incubator/ooo/branches/buildsys/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl Fri Oct  5 18:23:17 2012
@@ -28,27 +28,12 @@
 
 #include <com/sun/star/uno/XInterface.idl> 
 #include <com/sun/star/xml/sax/SAXException.idl> 
+#include <com/sun/star/xml/csax/XMLAttribute.idl>
  
  
 module com { module sun { module star { module xml { module csax {
 
 /**
- * A struct to keep information of an element's attribute.
- */
-struct XMLAttribute
-{
-	/**
-	 * the attribute name
-	 */
-	string sName;
-	
-	/**
-	 * the attribute value
-	 */
-	string sValue;
-}; 
-
-/**
  * A compressed XDocumentHandler interface.
  * <p>
  * All methods in this interface have the same function with methods



Mime
View raw message