dba33d: pull from dba33b

10 files changed, 92 insertions, 85 deletions

diff --git a/forms/qa/integration/forms/DocumentViewHelper.java b/forms/qa/integration/forms/DocumentViewHelper.java
index f106ba070f8c..212800f2b1e0 100644
--- a/forms/qa/integration/forms/DocumentViewHelper.java
+++ b/forms/qa/integration/forms/DocumentViewHelper.java
@@ -39,7 +39,7 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexContainer;
 import com.sun.star.form.FormComponentType;
 import com.sun.star.form.XForm;
-import com.sun.star.form.XFormController;
+import com.sun.star.form.runtime.XFormController;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java
index 91193ff479e5..5d2291a06b13 100644
--- a/forms/qa/integration/forms/FormControlTest.java
+++ b/forms/qa/integration/forms/FormControlTest.java
@@ -33,7 +33,7 @@ import com.sun.star.awt.XImageProducer;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
-import com.sun.star.form.XFormController;
+import com.sun.star.form.runtime.XFormController;
 import com.sun.star.form.XImageProducerSupplier;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.lang.EventObject;
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index c307783f179b..c8d868591029 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -342,7 +342,7 @@ void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_B
     aForbiddenProperties.insert( PROPERTY_VSCROLL );
     aForbiddenProperties.insert( PROPERTY_CONTROLLABEL );
     aForbiddenProperties.insert( PROPERTY_RICH_TEXT );
-    aForbiddenProperties.insert( PROPERTY_VERTICALALIGN );
+    aForbiddenProperties.insert( PROPERTY_VERTICAL_ALIGN );
     aForbiddenProperties.insert( PROPERTY_IMAGE_URL );
     aForbiddenProperties.insert( PROPERTY_IMAGE_POSITION );
     aForbiddenProperties.insert( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ) );
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 96412feed10a..38899ba81235 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -31,72 +31,72 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_forms.hxx"
 
-#include "componenttools.hxx"

-#include "DatabaseForm.hxx"

-#include "EventThread.hxx"

-#include "frm_module.hxx"

-#include "frm_resource.hrc"

-#include "frm_resource.hxx"

-#include "GroupManager.hxx"

-#include "property.hrc"

-#include "property.hxx"

-#include "services.hxx"

-

-#include <com/sun/star/awt/XControlContainer.hpp>

-#include <com/sun/star/awt/XTextComponent.hpp>

-#include <com/sun/star/form/DataSelectionType.hpp>

-#include <com/sun/star/form/FormComponentType.hpp>

-#include <com/sun/star/form/TabulatorCycle.hpp>

-#include <com/sun/star/frame/FrameSearchFlag.hpp>

-#include <com/sun/star/frame/XDispatch.hpp>

-#include <com/sun/star/frame/XDispatchProvider.hpp>

-#include <com/sun/star/frame/XModel.hpp>

-#include <com/sun/star/io/XObjectInputStream.hpp>

-#include <com/sun/star/io/XObjectOutputStream.hpp>

-#include <com/sun/star/sdb/CommandType.hpp>

-#include <com/sun/star/sdb/RowSetVetoException.hpp>

-#include <com/sun/star/sdb/SQLContext.hpp>

-#include <com/sun/star/sdb/XColumnUpdate.hpp>

-#include <com/sun/star/sdbc/DataType.hpp>

-#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>

-#include <com/sun/star/sdbc/ResultSetType.hpp>

-#include <com/sun/star/sdbc/XRowSet.hpp>

-#include <com/sun/star/sdbcx/Privilege.hpp>

-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>

-#include <com/sun/star/util/XCancellable.hpp>

-#include <com/sun/star/util/XURLTransformer.hpp>

+#include "componenttools.hxx"
+#include "DatabaseForm.hxx"
+#include "EventThread.hxx"
+#include "frm_module.hxx"
+#include "frm_resource.hrc"
+#include "frm_resource.hxx"
+#include "GroupManager.hxx"
+#include "property.hrc"
+#include "property.hxx"
+#include "services.hxx"
+
+#include <com/sun/star/awt/XControlContainer.hpp>
+#include <com/sun/star/awt/XTextComponent.hpp>
+#include <com/sun/star/form/DataSelectionType.hpp>
+#include <com/sun/star/form/FormComponentType.hpp>
+#include <com/sun/star/form/TabulatorCycle.hpp>
+#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/io/XObjectInputStream.hpp>
+#include <com/sun/star/io/XObjectOutputStream.hpp>
+#include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/sdb/RowSetVetoException.hpp>
+#include <com/sun/star/sdb/SQLContext.hpp>
+#include <com/sun/star/sdb/XColumnUpdate.hpp>
+#include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
+#include <com/sun/star/sdbc/ResultSetType.hpp>
+#include <com/sun/star/sdbc/XRowSet.hpp>
+#include <com/sun/star/sdbcx/Privilege.hpp>
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/util/XCancellable.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/util/XModifiable2.hpp>
-

-#include <comphelper/basicio.hxx>

-#include <comphelper/container.hxx>

-#include <comphelper/enumhelper.hxx>

-#include <comphelper/extract.hxx>

-#include <comphelper/seqstream.hxx>

-#include <comphelper/sequence.hxx>

-#include <comphelper/stl_types.hxx>

-#include <comphelper/uno3.hxx>

-#include <connectivity/dbtools.hxx>

-#include <cppuhelper/exc_hlp.hxx>

-#include <cppuhelper/implbase2.hxx>

-#include <osl/mutex.hxx>

-#include <rtl/math.hxx>

-#include <rtl/tencinfo.h>

-#include <svtools/inetstrm.hxx>

-#include <svtools/inettype.hxx>

-#include <tools/debug.hxx>

-#include <tools/diagnose_ex.h>

-#include <tools/fsys.hxx>

-#include <tools/inetmsg.hxx>

-#include <tools/urlobj.hxx>

-#include <unotools/ucblockbytes.hxx>

-#include <unotools/ucbstreamhelper.hxx>

-#include <vcl/svapp.hxx>

-#include <vcl/timer.hxx>

-#include <vos/mutex.hxx>

-
-#include <ctype.h>

-#include <hash_map>

-//#include <stdio.h>

+
+#include <comphelper/basicio.hxx>
+#include <comphelper/container.hxx>
+#include <comphelper/enumhelper.hxx>
+#include <comphelper/extract.hxx>
+#include <comphelper/seqstream.hxx>
+#include <comphelper/sequence.hxx>
+#include <comphelper/stl_types.hxx>
+#include <comphelper/uno3.hxx>
+#include <connectivity/dbtools.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <osl/mutex.hxx>
+#include <rtl/math.hxx>
+#include <rtl/tencinfo.h>
+#include <svtools/inetstrm.hxx>
+#include <svtools/inettype.hxx>
+#include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
+#include <tools/fsys.hxx>
+#include <tools/inetmsg.hxx>
+#include <tools/urlobj.hxx>
+#include <unotools/ucblockbytes.hxx>
+#include <unotools/ucbstreamhelper.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/timer.hxx>
+#include <vos/mutex.hxx>
+
+#include <ctype.h>
+#include <hash_map>
+//#include <stdio.h>
 
 // compatiblity: DatabaseCursorType is dead, but for compatiblity reasons we still have to write it ...
 namespace com {
diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index bf2d5d4d7446..8dd23dacb77f 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -153,7 +153,7 @@ namespace frm
     FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_SELECT_SEQ,       "DefaultSelection" );
     FORMS_CONSTASCII_STRING( PROPERTY_MULTISELECTION,           "MultiSelection" );
     FORMS_CONSTASCII_STRING( PROPERTY_ALIGN,                    "Align" );
-    FORMS_CONSTASCII_STRING( PROPERTY_VERTICALALIGN,            "VerticalAlign" );
+    FORMS_CONSTASCII_STRING( PROPERTY_VERTICAL_ALIGN,           "VerticalAlign" );
     FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_DATE,             "DefaultDate" );
     FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_TIME,             "DefaultTime" );
     FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_VALUE,            "DefaultValue" );
diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc
index df94d1575a5a..624e4c2f1ce0 100644
--- a/forms/source/inc/property.hrc
+++ b/forms/source/inc/property.hrc
@@ -63,7 +63,7 @@ namespace frm
 #define PROPERTY_ID_INPUT_REQUIRED      (PROPERTY_ID_START + 19)
 #define PROPERTY_ID_WRITING_MODE        (PROPERTY_ID_START + 20)
 #define PROPERTY_ID_CONTEXT_WRITING_MODE    (PROPERTY_ID_START + 21)
-    // free
+#define PROPERTY_ID_VERTICAL_ALIGN      (PROPERTY_ID_START + 22)
     // free
     // free
     // free
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index d38b350ada32..067512d3c659 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -40,7 +40,9 @@
 /** === begin UNO includes === **/
 #include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
+#include <com/sun/star/style/VerticalAlignment.hpp>
 /** === end UNO includes === **/
+
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/guarding.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
@@ -67,6 +69,7 @@ namespace frm
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::form;
     using namespace ::com::sun::star::util;
+    using namespace ::com::sun::star::style;
 
     namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
 
@@ -120,6 +123,7 @@ namespace frm
         m_aTabStop               = _pOriginal->m_aTabStop;
         m_aBackgroundColor       = _pOriginal->m_aBackgroundColor;
         m_aBorderColor           = _pOriginal->m_aBorderColor;
+        m_aVerticalAlignment     = _pOriginal->m_aVerticalAlignment;
         m_sDefaultControl        = _pOriginal->m_sDefaultControl;
         m_sHelpText              = _pOriginal->m_sHelpText;
         m_sHelpURL               = _pOriginal->m_sHelpURL;
@@ -201,9 +205,10 @@ namespace frm
         REGISTER_PROP_2( RICH_TEXT,             m_bReallyActAsRichText,     BOUND, MAYBEDEFAULT );
         REGISTER_PROP_2( HIDEINACTIVESELECTION, m_bHideInactiveSelection,   BOUND, MAYBEDEFAULT );
 
-        REGISTER_VOID_PROP_2( TABSTOP,          m_aTabStop,         sal_Bool,  BOUND, MAYBEDEFAULT );
-        REGISTER_VOID_PROP_2( BACKGROUNDCOLOR,  m_aBackgroundColor, sal_Int32, BOUND, MAYBEDEFAULT );
-        REGISTER_VOID_PROP_2( BORDERCOLOR,      m_aBorderColor,     sal_Int32, BOUND, MAYBEDEFAULT );
+        REGISTER_VOID_PROP_2( TABSTOP,          m_aTabStop,             sal_Bool,           BOUND, MAYBEDEFAULT );
+        REGISTER_VOID_PROP_2( BACKGROUNDCOLOR,  m_aBackgroundColor,     sal_Int32,          BOUND, MAYBEDEFAULT );
+        REGISTER_VOID_PROP_2( BORDERCOLOR,      m_aBorderColor,         sal_Int32,          BOUND, MAYBEDEFAULT );
+        REGISTER_VOID_PROP_2( VERTICAL_ALIGN,   m_aVerticalAlignment,   VerticalAlignment,  BOUND, MAYBEDEFAULT );
 
         // properties which exist only for compatibility with the css.swt.UnoControlEditModel,
         // since we replace the default implementation for this service
@@ -455,6 +460,7 @@ namespace frm
         case PROPERTY_ID_TABSTOP:
         case PROPERTY_ID_BACKGROUNDCOLOR:
         case PROPERTY_ID_BORDERCOLOR:
+        case PROPERTY_ID_VERTICAL_ALIGN:
             /* void */
             break;
 
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index 5e905e2873ad..5cdfe56f0dea 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -74,6 +74,7 @@ namespace frm
         ::com::sun::star::uno::Any  m_aTabStop;
         ::com::sun::star::uno::Any  m_aBackgroundColor;
         ::com::sun::star::uno::Any  m_aBorderColor;
+        ::com::sun::star::uno::Any  m_aVerticalAlignment;
         ::rtl::OUString             m_sDefaultControl;
         ::rtl::OUString             m_sHelpText;
         ::rtl::OUString             m_sHelpURL;
@@ -115,7 +116,7 @@ namespace frm
         DECLARE_DEFAULT_LEAF_XTOR( ORichTextModel );
 
         // UNO
-        DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarModel, OControlModel );
+        DECLARE_UNO3_AGG_DEFAULTS( ORichTextModel, OControlModel );
         virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 5416e5d567e9..6b63d4b8a756 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -92,7 +92,7 @@ namespace frm
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::sdbc::XRowSet;
     using ::com::sun::star::sdbc::XResultSetUpdate;
-    using ::com::sun::star::form::XFormController;
+    using ::com::sun::star::form::runtime::XFormController;
     using ::com::sun::star::form::runtime::XFeatureInvalidation;
     using ::com::sun::star::form::runtime::FeatureState;
     using ::com::sun::star::lang::IllegalArgumentException;
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 211d0be60fd4..3d5eb8fa17ce 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -71,16 +71,16 @@ namespace frm
         class MethodGuard;
 
     private:
-        ::comphelper::ComponentContext                                                  m_aContext;
-        ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >     m_xController;
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >             m_xCursor;
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >    m_xUpdateCursor;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >       m_xCursorProperties;
-        ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >           m_xLoadableForm;
+        ::comphelper::ComponentContext                                                          m_aContext;
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >    m_xController;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >                     m_xCursor;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >            m_xUpdateCursor;
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >               m_xCursorProperties;
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >                   m_xLoadableForm;
         ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFeatureInvalidation >
-                                                                                        m_xFeatureInvalidation;
+                                                                                                m_xFeatureInvalidation;
         mutable ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >
-                                                                                        m_xParser;
+                                                                                                m_xParser;
 
         bool    m_bInitializedParser;
         bool    m_bActiveControlModified;
@@ -132,7 +132,7 @@ namespace frm
         // XFormOperations
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getCursor() throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > SAL_CALL getUpdateCursor() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > SAL_CALL getController() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getController() throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFeatureInvalidation > SAL_CALL getFeatureInvalidation() throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setFeatureInvalidation(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFeatureInvalidation > & the_value) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::form::runtime::FeatureState SAL_CALL getState(::sal_Int16 Feature) throw (::com::sun::star::uno::RuntimeException);
@@ -163,7 +163,7 @@ namespace frm
 
     private:
         // service constructors
-        void    createWithFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >& _rxController );
+        void    createWithFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController );
         void    createWithForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm );
 
         /** determines whether or not we're already disposed