ooo-build r14862 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14862 - in trunk: . patches/dev300
- Date: Tue, 16 Dec 2008 04:20:26 +0000 (UTC)
Author: kyoshida
Date: Tue Dec 16 04:20:25 2008
New Revision: 14862
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14862&view=rev
Log:
2008-12-15 Kohei Yoshida <kyoshida novell com>
* patches/dev300/forms-radio-button-group-names-m36.diff: patch for m36
or older.
* patches/dev300/forms-radio-button-group-names.diff: patch for m37 or
newer.
* patches/dev300/apply: resurrected most of the disabled VBAObjects for
dev300-m37 which were directly or indirectly dependent on the radio
button group names patch.
Added:
trunk/patches/dev300/forms-radio-button-group-names-m36.diff
- copied unchanged from r14861, /trunk/patches/dev300/forms-radio-button-group-names.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/forms-radio-button-group-names.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Tue Dec 16 04:20:25 2008
@@ -533,20 +533,18 @@
[ RadioButtons <= dev300-m36 ]
# Add a GroupName property to RadioButtons so that RadioButtons don't need to
# share the same name to be part of the same group.
-forms-radio-button-group-names.diff, n#310052, i#30823, jonp
-# depends on forms-radio-button-group-names.diff,
-xl-import-formradiobutton.diff, noelpwer, i#30823
-# persist the groupname for basic dialogs also
-dialog-groupname-persist.diff, noelpwer, i#30823
+forms-radio-button-group-names-m36.diff, n#310052, i#30823, jonp
[ RadioButtons > dev300-m36 ]
# Add a GroupName property to RadioButtons so that RadioButtons don't need to
# share the same name to be part of the same group.
-#FIXME_m37 forms-radio-button-group-names.diff, n#310052, i#30823, jonp
+forms-radio-button-group-names.diff, n#310052, i#30823, jonp
+
+[ RadioButtons ]
# depends on forms-radio-button-group-names.diff,
-#FIXME_m37 xl-import-formradiobutton.diff, noelpwer, i#30823
+xl-import-formradiobutton.diff, noelpwer, i#30823
# persist the groupname for basic dialogs also
-#FIXME_m37 dialog-groupname-persist.diff, noelpwer, i#30823
+dialog-groupname-persist.diff, noelpwer, i#30823
[ SELinux ]
# make OOo work under SELinux
@@ -1666,45 +1664,26 @@
[ VBAObjects <= dev300-m36 ]
controls-with-images-in-document.diff, i#38215, noelpwer
-[ VBAObjects > dev300-m36 ]
-#FIXME_m37 controls-with-images-in-document.diff, i#38215, noelpwer
-
[ VBAObjects ]
# import graphic for image control
controls-with-images-import.diff, Fong
-[ VBAObjects <= dev300-m36 ]
#use of form control models in userforms/dialogs, additionally
#enables use of document embedded images in image control for
#userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
enhanced-form-userform-controls.diff, noelpwer
-[ VBAObjects > dev300-m36 ]
-#use of form control models in userforms/dialogs, additionally
-#enables use of document embedded images in image control for
-#userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
-#FIXME_m37 enhanced-form-userform-controls.diff, noelpwer
-
-[ VBAObjects ]
# object module support... getting there
ObjectModule.diff
# userform ( depends on ObjectModule.diff )
vba-userform.diff
-[ VBAObjects <= dev300-m36 ]
# uno interface for vba mode
vba-compatible-mode-uno.diff, Fong
# support to display spinbutton in userform
vba-spinbutton-in-userform.diff, Fong
-[ VBAObjects > dev300-m36 ]
-# uno interface for vba mode
-#FIXME_m37 vba-compatible-mode-uno.diff, Fong
-
-# support to display spinbutton in userform
-#FIXME_m37 vba-spinbutton-in-userform.diff, Fong
-
[ VBAObjects ]
vbaevents-services-sources.diff, i#68893
@@ -1744,14 +1723,9 @@
# fix bug comparing string that can't be converted to number
stringnumbercompare.diff, n#422559
-[ VBAObjects <= dev300-m36 ]
# fix import sizes and geometry of userforms
vba-userform-geometry-tweak.diff
-[ VBAObjects > dev300-m36 ]
-# fix import sizes and geometry of userforms
-#FIXME_m37 vba-userform-geometry-tweak.diff
-
[ VBAObjects ]
# n#426415
vba-allow-forms-resetvalue-binding.diff
Modified: trunk/patches/dev300/forms-radio-button-group-names.diff
==============================================================================
--- trunk/patches/dev300/forms-radio-button-group-names.diff (original)
+++ trunk/patches/dev300/forms-radio-button-group-names.diff Tue Dec 16 04:20:25 2008
@@ -1,41 +1,23 @@
-Index: extensions/inc/extensio.hrc
-===================================================================
-RCS file: /cvs/util/extensions/inc/extensio.hrc,v
-retrieving revision 1.34
-diff -u -p -r1.34 extensio.hrc
---- extensions/inc/extensio.hrc 11 Apr 2008 09:15:58 -0000 1.34
-+++ extensions/inc/extensio.hrc 6 Jun 2008 20:18:38 -0000
-@@ -157,7 +157,7 @@
-
- //-----------------------------------------------------------------------
- // FREE
-- // FREE
-+#define HID_PROP_GROUP_NAME (HID_FORMS_START + 1)
- #define HID_PROP_GROUPBOX (HID_FORMS_START + 2)
- #define HID_PROP_CONTROLSOURCE (HID_FORMS_START + 3)
- #define HID_PROP_NAME (HID_FORMS_START + 4)
-Index: extensions/source/propctrlr/formmetadata.hxx
-===================================================================
-RCS file: /cvs/util/extensions/source/propctrlr/formmetadata.hxx,v
-retrieving revision 1.35
-diff -u -p -r1.35 formmetadata.hxx
---- extensions/source/propctrlr/formmetadata.hxx 11 Apr 2008 10:58:41 -0000 1.35
-+++ extensions/source/propctrlr/formmetadata.hxx 6 Jun 2008 20:18:39 -0000
-@@ -166,6 +166,7 @@ namespace pcr
- #define PROPERTY_ID_ALLOWADDITIONS 20
- #define PROPERTY_ID_ALLOWEDITS 21
- #define PROPERTY_ID_ALLOWDELETIONS 22
-+ #define PROPERTY_ID_GROUP_NAME 23
- #define PROPERTY_ID_NAVIGATION 24
- #define PROPERTY_ID_CYCLE 25
- #define PROPERTY_ID_HIDDEN_VALUE 26
-Index: extensions/source/propctrlr/formmetadata.cxx
-===================================================================
-RCS file: /cvs/util/extensions/source/propctrlr/formmetadata.cxx,v
-retrieving revision 1.50
-diff -u -p -r1.50 formmetadata.cxx
---- extensions/source/propctrlr/formmetadata.cxx 11 Apr 2008 10:58:09 -0000 1.50
-+++ extensions/source/propctrlr/formmetadata.cxx 6 Jun 2008 20:18:42 -0000
+diff --git extensions/inc/extensio.hrc extensions/inc/extensio.hrc
+index 10e21c8..15c2c06 100644
+--- extensions/inc/extensio.hrc
++++ extensions/inc/extensio.hrc
+@@ -457,9 +457,10 @@
+ #define UID_PROP_DLG_BORDERCOLOR (HID_FORMS_START + 338)
+ #define HID_PROP_IMAGEPOSITION (HID_FORMS_START + 339)
+ #define HID_PROP_NOLABEL (HID_FORMS_START + 340)
++#define HID_PROP_GROUP_NAME (HID_FORMS_START + 341)
+ // please adjust HID_LAST_FORMS_ID if you add new ids here!
+
+-#define HID_LAST_FORMS_ID HID_PROP_NOLABEL
++#define HID_LAST_FORMS_ID HID_PROP_GROUP_NAME
+
+ #if HID_LAST_FORMS_ID > HID_FORMS_END
+ #error id overflow
+diff --git extensions/source/propctrlr/formmetadata.cxx extensions/source/propctrlr/formmetadata.cxx
+index 750c7dc..47467e2 100644
+--- extensions/source/propctrlr/formmetadata.cxx
++++ extensions/source/propctrlr/formmetadata.cxx
@@ -142,6 +142,7 @@ namespace pcr
DEF_INFO_2( TITLE, TITLE, TITLE, FORM_VISIBLE, DIALOG_VISIBLE ),
DEF_INFO_3( LABEL, LABEL, LABEL, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
@@ -44,44 +26,22 @@
DEF_INFO_2( TEXT, TEXT, TEXT, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_3( MAXTEXTLEN, MAXTEXTLEN, MAXTEXTLEN, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_3( EDITMASK, EDITMASK, EDITMASK, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
-Index: extensions/source/propctrlr/formstrings.hxx
-===================================================================
-RCS file: /cvs/util/extensions/source/propctrlr/formstrings.hxx,v
-retrieving revision 1.39
-diff -u -p -r1.39 formstrings.hxx
---- extensions/source/propctrlr/formstrings.hxx 11 Apr 2008 11:01:21 -0000 1.39
-+++ extensions/source/propctrlr/formstrings.hxx 6 Jun 2008 20:18:45 -0000
-@@ -50,6 +50,7 @@ namespace pcr
- PCR_CONSTASCII_STRING( PROPERTY_TABINDEX, "TabIndex");
- PCR_CONSTASCII_STRING( PROPERTY_TAG, "Tag");
- PCR_CONSTASCII_STRING( PROPERTY_NAME, "Name");
-+ PCR_CONSTASCII_STRING( PROPERTY_GROUP_NAME, "GroupName");
- PCR_CONSTASCII_STRING( PROPERTY_VALUE, "Value");
- PCR_CONSTASCII_STRING( PROPERTY_TEXT, "Text");
- PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION, "NavigationBarMode");
-Index: extensions/source/propctrlr/formresid.hrc
-===================================================================
-RCS file: /cvs/util/extensions/source/propctrlr/formresid.hrc,v
-retrieving revision 1.37
-diff -u -p -r1.37 formresid.hrc
---- extensions/source/propctrlr/formresid.hrc 11 Apr 2008 11:00:24 -0000 1.37
-+++ extensions/source/propctrlr/formresid.hrc 6 Jun 2008 20:18:46 -0000
-@@ -147,7 +147,7 @@
- #define RID_STR_TAG ( RID_FORMBROWSER_START + 116 )
- #define RID_STR_HELPTEXT ( RID_FORMBROWSER_START + 117 )
- #define RID_STR_HELPURL ( RID_FORMBROWSER_START + 118 )
-- // FREE
-+#define RID_STR_GROUP_NAME ( RID_FORMBROWSER_START + 119 )
- #define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 )
- #define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 )
- // FREE
-Index: extensions/source/propctrlr/formres.src
-===================================================================
-RCS file: /cvs/util/extensions/source/propctrlr/formres.src,v
-retrieving revision 1.82
-diff -u -p -r1.82 formres.src
---- extensions/source/propctrlr/formres.src 11 Apr 2008 10:59:33 -0000 1.82
-+++ extensions/source/propctrlr/formres.src 6 Jun 2008 20:18:47 -0000
+diff --git extensions/source/propctrlr/formmetadata.hxx extensions/source/propctrlr/formmetadata.hxx
+index e6e94cc..2773208 100644
+--- extensions/source/propctrlr/formmetadata.hxx
++++ extensions/source/propctrlr/formmetadata.hxx
+@@ -166,6 +166,7 @@ namespace pcr
+ #define PROPERTY_ID_ALLOWADDITIONS 20
+ #define PROPERTY_ID_ALLOWEDITS 21
+ #define PROPERTY_ID_ALLOWDELETIONS 22
++ #define PROPERTY_ID_GROUP_NAME 23
+ #define PROPERTY_ID_NAVIGATION 24
+ #define PROPERTY_ID_CYCLE 25
+ #define PROPERTY_ID_HIDDEN_VALUE 26
+diff --git extensions/source/propctrlr/formres.src extensions/source/propctrlr/formres.src
+index a2634f5..3ee3660 100644
+--- extensions/source/propctrlr/formres.src
++++ extensions/source/propctrlr/formres.src
@@ -230,6 +230,10 @@ String RID_STR_NAME
{
Text [ en-US ] = "Name" ;
@@ -93,42 +53,45 @@
String RID_STR_TABINDEX
{
Text [ en-US ] = "Tab order" ;
-Index: extensions/util/hidother.src
-===================================================================
-RCS file: /cvs/util/extensions/util/hidother.src,v
-retrieving revision 1.21
-diff -u -p -r1.21 hidother.src
---- extensions/util/hidother.src 11 Apr 2008 12:12:27 -0000 1.21
-+++ extensions/util/hidother.src 6 Jun 2008 20:18:48 -0000
-@@ -306,3 +306,4 @@ hidspecial HID_CHECK_FOR_UPD_STATUS
- hidspecial HID_CHECK_FOR_UPD_DESCRIPTION { HelpId = HID_CHECK_FOR_UPD_DESCRIPTION; }
+diff --git extensions/source/propctrlr/formresid.hrc extensions/source/propctrlr/formresid.hrc
+index 8bbf6a1..acdb70f 100644
+--- extensions/source/propctrlr/formresid.hrc
++++ extensions/source/propctrlr/formresid.hrc
+@@ -150,7 +150,7 @@
+ #define RID_STR_INPUT_REQUIRED ( RID_FORMBROWSER_START + 119 )
+ #define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 )
+ #define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 )
+- // FREE
++#define RID_STR_GROUP_NAME ( RID_FORMBROWSER_START + 122 )
+ // FREE
+ // FREE
+ // FREE
+diff --git extensions/source/propctrlr/formstrings.hxx extensions/source/propctrlr/formstrings.hxx
+index 1e8a250..45a289a 100644
+--- extensions/source/propctrlr/formstrings.hxx
++++ extensions/source/propctrlr/formstrings.hxx
+@@ -50,6 +50,7 @@ namespace pcr
+ PCR_CONSTASCII_STRING( PROPERTY_TABINDEX, "TabIndex");
+ PCR_CONSTASCII_STRING( PROPERTY_TAG, "Tag");
+ PCR_CONSTASCII_STRING( PROPERTY_NAME, "Name");
++ PCR_CONSTASCII_STRING( PROPERTY_GROUP_NAME, "GroupName");
+ PCR_CONSTASCII_STRING( PROPERTY_VALUE, "Value");
+ PCR_CONSTASCII_STRING( PROPERTY_TEXT, "Text");
+ PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION, "NavigationBarMode");
+diff --git extensions/util/hidother.src extensions/util/hidother.src
+index 79b979d..c69fa2c 100644
+--- extensions/util/hidother.src
++++ extensions/util/hidother.src
+@@ -307,3 +307,4 @@ hidspecial HID_CHECK_FOR_UPD_DESCRIPTION { HelpId = HID_CHECK_FOR_UPD_DES
hidspecial HID_CHECK_FOR_UPD_CANCEL { HelpId = HID_CHECK_FOR_UPD_CANCEL; }
hidspecial HID_PROP_NOLABEL { HelpId = HID_PROP_NOLABEL; }
+ hidspecial HID_PROP_INPUT_REQUIRED { HelpId = HID_PROP_INPUT_REQUIRED; }
+hidspecial HID_PROP_GROUP_NAME { HelpId = HID_PROP_GROUP_NAME; }
-Index: forms/source/component/GroupManager.hxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/component/GroupManager.hxx,v
-retrieving revision 1.12
-diff -u -p -r1.12 GroupManager.hxx
---- forms/source/component/GroupManager.hxx 11 Apr 2008 08:15:27 -0000 1.12
-+++ forms/source/component/GroupManager.hxx 6 Jun 2008 20:18:49 -0000
-@@ -220,6 +220,8 @@ public:
- void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, ::rtl::OUString& Name);
- void getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup);
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > getControlModels();
-+
-+ static ::rtl::OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent );
- };
-
-
-Index: forms/source/component/GroupManager.cxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/component/GroupManager.cxx,v
-retrieving revision 1.18
-diff -u -p -r1.18 GroupManager.cxx
---- forms/source/component/GroupManager.cxx 11 Apr 2008 08:15:07 -0000 1.18
-+++ forms/source/component/GroupManager.cxx 6 Jun 2008 20:18:50 -0000
-@@ -127,14 +127,13 @@ OGroupComp::OGroupComp(const Reference<X
+diff --git forms/source/component/GroupManager.cxx forms/source/component/GroupManager.cxx
+index d831a82..f5a9ecb 100644
+--- forms/source/component/GroupManager.cxx
++++ forms/source/component/GroupManager.cxx
+@@ -127,14 +127,13 @@ OGroupComp::OGroupComp(const Reference<XPropertySet>& rxSet, sal_Int32 nInsertPo
,m_xControlModel(rxSet,UNO_QUERY)
,m_nPos( nInsertPos )
,m_nTabIndex(0)
@@ -144,7 +107,7 @@
}
}
-@@ -321,7 +320,8 @@ void OGroupManager::removeFromGroupMap(c
+@@ -321,7 +320,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
aFind->second.RemoveComponent( _xSet );
// Wenn Anzahl der Gruppenelemente == 1 ist, Gruppe deaktivieren
@@ -154,7 +117,7 @@
{
OActiveGroups::iterator aActiveFind = ::std::find(
m_aActiveGroupMap.begin(),
-@@ -332,7 +332,7 @@ void OGroupManager::removeFromGroupMap(c
+@@ -332,7 +332,7 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
{
// the group is active. Deactivate it if the remaining component
// is *no* radio button
@@ -163,7 +126,7 @@
m_aActiveGroupMap.erase( aActiveFind );
}
}
-@@ -341,6 +341,8 @@ void OGroupManager::removeFromGroupMap(c
+@@ -341,6 +341,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
// Bei Component als PropertyChangeListener abmelden
_xSet->removePropertyChangeListener( PROPERTY_NAME, this );
@@ -172,7 +135,7 @@
if (hasProperty(PROPERTY_TABINDEX, _xSet))
_xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this );
}
-@@ -351,10 +353,23 @@ void SAL_CALL OGroupManager::propertyCha
+@@ -351,10 +353,23 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro
// Component aus Gruppe entfernen
::rtl::OUString sGroupName;
@@ -198,7 +161,7 @@
removeFromGroupMap(sGroupName,xSet);
-@@ -437,8 +452,7 @@ void OGroupManager::InsertElement( const
+@@ -437,8 +452,7 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
m_pCompGroup->InsertComponent( xSet );
// Component in Gruppe aufnehmen
@@ -208,7 +171,7 @@
OGroupArr::iterator aFind = m_aGroupArr.find(sGroupName);
-@@ -476,6 +490,8 @@ void OGroupManager::InsertElement( const
+@@ -476,6 +490,8 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
// Bei Component als PropertyChangeListener anmelden
xSet->addPropertyChangeListener( PROPERTY_NAME, this );
@@ -217,7 +180,7 @@
// Tabindex muss nicht jeder unterstuetzen
if (hasProperty(PROPERTY_TABINDEX, xSet))
-@@ -492,12 +508,26 @@ void OGroupManager::RemoveElement( const
+@@ -492,12 +508,26 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet )
return;
// Component aus Gruppe entfernen
@@ -246,29 +209,23 @@
//.........................................................................
} // namespace frm
//.........................................................................
-Index: forms/source/component/RadioButton.hxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/component/RadioButton.hxx,v
-retrieving revision 1.12
-diff -u -p -r1.12 RadioButton.hxx
---- forms/source/component/RadioButton.hxx 11 Apr 2008 08:19:23 -0000 1.12
-+++ forms/source/component/RadioButton.hxx 6 Jun 2008 20:44:00 -0000
-@@ -87,6 +87,8 @@ private:
- our mutex is aquired exactly once
- */
- void setNewAggregateState( const ::com::sun::star::uno::Any& _rValue );
+diff --git forms/source/component/GroupManager.hxx forms/source/component/GroupManager.hxx
+index bc5a059..b139998 100644
+--- forms/source/component/GroupManager.hxx
++++ forms/source/component/GroupManager.hxx
+@@ -220,6 +220,8 @@ public:
+ void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, ::rtl::OUString& Name);
+ void getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup);
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > getControlModels();
+
-+ void setControlSource();
++ static ::rtl::OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent );
};
- //==================================================================
-Index: forms/source/component/RadioButton.cxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/component/RadioButton.cxx,v
-retrieving revision 1.22
-diff -u -p -r1.22 RadioButton.cxx
---- forms/source/component/RadioButton.cxx 11 Apr 2008 08:19:08 -0000 1.22
-+++ forms/source/component/RadioButton.cxx 6 Jun 2008 20:18:51 -0000
+
+diff --git forms/source/component/RadioButton.cxx forms/source/component/RadioButton.cxx
+index b77979b..d9674c5 100644
+--- forms/source/component/RadioButton.cxx
++++ forms/source/component/RadioButton.cxx
@@ -31,6 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_forms.hxx"
@@ -277,7 +234,7 @@
#include "property.hxx"
#ifndef _FRM_PROPERTY_HRC_
#include "property.hrc"
-@@ -122,6 +123,7 @@ ORadioButtonModel::ORadioButtonModel(con
+@@ -122,6 +123,7 @@ ORadioButtonModel::ORadioButtonModel(const Reference<XMultiServiceFactory>& _rxF
m_nClassId = FormComponentType::RADIOBUTTON;
m_aLabelServiceName = FRM_SUN_COMPONENT_GROUPBOX;
initValueProperty( PROPERTY_STATE, PROPERTY_ID_STATE );
@@ -285,7 +242,7 @@
}
//------------------------------------------------------------------
-@@ -169,7 +171,11 @@ StringSequence SAL_CALL ORadioButtonMode
+@@ -169,7 +171,11 @@ StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(Runt
void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, const Any& rValue)
{
// mein Name
@@ -298,7 +255,7 @@
// meine Siblings durchiterieren
Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
-@@ -177,8 +183,9 @@ void ORadioButtonModel::SetSiblingPropsT
+@@ -177,8 +183,9 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
{
Reference<XPropertySet> xMyProps;
query_interface(static_cast<XWeak*>(this), xMyProps);
@@ -310,7 +267,7 @@
{
Reference<XPropertySet> xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
if (!xSiblingProperties.is())
-@@ -195,8 +202,8 @@ void ORadioButtonModel::SetSiblingPropsT
+@@ -195,8 +202,8 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
continue;
// das 'zur selben Gruppe gehoeren' wird am Namen festgemacht
@@ -321,7 +278,7 @@
xSiblingProperties->setPropertyValue(rPropName, rValue);
}
}
-@@ -223,40 +230,7 @@ void ORadioButtonModel::setFastPropertyV
+@@ -223,40 +230,7 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
// die andere Richtung : wenn sich mein Name aendert ...
if (nHandle == PROPERTY_ID_NAME)
{
@@ -363,7 +320,7 @@
}
if (nHandle == PROPERTY_ID_DEFAULTCHECKED)
-@@ -274,6 +248,52 @@ void ORadioButtonModel::setFastPropertyV
+@@ -274,6 +248,52 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
}
}
@@ -416,7 +373,7 @@
//------------------------------------------------------------------------------
void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
-@@ -363,6 +383,13 @@ void ORadioButtonModel::_propertyChanged
+@@ -363,6 +383,13 @@ void ORadioButtonModel::_propertyChanged(const PropertyChangeEvent& _rEvent) thr
SetSiblingPropsTo( PROPERTY_STATE, aZero );
}
}
@@ -430,13 +387,23 @@
OReferenceValueComponent::_propertyChanged( _rEvent );
}
-Index: forms/source/inc/frm_strings.hxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/inc/frm_strings.hxx,v
-retrieving revision 1.17
-diff -u -p -r1.17 frm_strings.hxx
---- forms/source/inc/frm_strings.hxx 11 Apr 2008 08:34:01 -0000 1.17
-+++ forms/source/inc/frm_strings.hxx 6 Jun 2008 20:18:54 -0000
+diff --git forms/source/component/RadioButton.hxx forms/source/component/RadioButton.hxx
+index c193f8a..e1a7e7e 100644
+--- forms/source/component/RadioButton.hxx
++++ forms/source/component/RadioButton.hxx
+@@ -87,6 +87,8 @@ private:
+ our mutex is aquired exactly once
+ */
+ void setNewAggregateState( const ::com::sun::star::uno::Any& _rValue );
++
++ void setControlSource();
+ };
+
+ //==================================================================
+diff --git forms/source/inc/frm_strings.hxx forms/source/inc/frm_strings.hxx
+index ee21a42..df18831 100644
+--- forms/source/inc/frm_strings.hxx
++++ forms/source/inc/frm_strings.hxx
@@ -100,6 +100,7 @@ namespace frm
FORMS_CONSTASCII_STRING( PROPERTY_TABINDEX, "TabIndex" );
FORMS_CONSTASCII_STRING( PROPERTY_TAG, "Tag" );
@@ -445,235 +412,24 @@
FORMS_CONSTASCII_STRING( PROPERTY_CLASSID, "ClassId" );
FORMS_CONSTASCII_STRING( PROPERTY_FETCHSIZE, "FetchSize" );
FORMS_CONSTASCII_STRING( PROPERTY_VALUE, "Value" );
-Index: forms/source/inc/property.hrc
-===================================================================
-RCS file: /cvs/gsl/forms/source/inc/property.hrc,v
-retrieving revision 1.21
-diff -u -p -r1.21 property.hrc
---- forms/source/inc/property.hrc 11 Apr 2008 08:35:13 -0000 1.21
-+++ forms/source/inc/property.hrc 6 Jun 2008 20:18:56 -0000
-@@ -60,7 +60,7 @@ namespace frm
- #define PROPERTY_ID_ALLOWEDITS (PROPERTY_ID_START + 16)
+diff --git forms/source/inc/property.hrc forms/source/inc/property.hrc
+index 335ce2a..c057846 100644
+--- forms/source/inc/property.hrc
++++ forms/source/inc/property.hrc
+@@ -61,7 +61,7 @@ namespace frm
#define PROPERTY_ID_ALLOWDELETIONS (PROPERTY_ID_START + 17)
#define PROPERTY_ID_NATIVE_LOOK (PROPERTY_ID_START + 18)
+ #define PROPERTY_ID_INPUT_REQUIRED (PROPERTY_ID_START + 19)
- // free
-+#define PROPERTY_ID_GROUP_NAME (PROPERTY_ID_START + 19)
++#define PROPERTY_ID_GROUP_NAME (PROPERTY_ID_START + 20)
// free
// free
// free
-diff --git xmloff/inc/xmlnmspe.hxx xmloff/inc/xmlnmspe.hxx
-index cc17d30..c563c50 100644
---- xmloff/inc/xmlnmspe.hxx
-+++ xmloff/inc/xmlnmspe.hxx
-@@ -95,6 +95,7 @@ XML_OLD_NAMESPACE( META, 6U )
-
- // experimental namespaces
- XML_NAMESPACE( FIELD, 100U )
-+XML_NAMESPACE( FORMX, 101U ) // form interop extensions
-
-
- #endif // _XMLOFF_XMLNMSPE_HXX
-diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
-index ea7854e..b012bb7 100644
---- xmloff/inc/xmloff/xmltoken.hxx
-+++ xmloff/inc/xmloff/xmltoken.hxx
-@@ -142,6 +142,10 @@ namespace xmloff { namespace token {
- XML_NP_RDFA,
- XML_N_RDFA,
-
-+ // jonp: 2008-09-24 Excel Interop
-+ XML_NP_FORMX,
-+ XML_N_FORMX,
-+
- // units
- XML_UNIT_MM,
- XML_UNIT_M,
-diff --git xmloff/source/core/xmlexp.cxx xmloff/source/core/xmlexp.cxx
-index 1c3f4b1..84559a3 100644
---- xmloff/source/core/xmlexp.cxx
-+++ xmloff/source/core/xmlexp.cxx
-@@ -308,6 +308,7 @@ void SvXMLExport::_InitCtor()
- mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD );
- mpNamespaceMap->Add( GetXMLToken(XML_NP_XSI), GetXMLToken(XML_N_XSI), XML_NAMESPACE_XSI );
- mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
-+ mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX );
- }
- if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
- {
-diff --git xmloff/source/core/xmlimp.cxx xmloff/source/core/xmlimp.cxx
-index bc3f69a..42a4de4 100644
---- xmloff/source/core/xmlimp.cxx
-+++ xmloff/source/core/xmlimp.cxx
-@@ -112,6 +112,7 @@ sal_Char __READONLY_DATA sXML_np__script[] = "_script";
- sal_Char __READONLY_DATA sXML_np__config[] = "_config";
- sal_Char __READONLY_DATA sXML_np__db[] = "_db";
- sal_Char __READONLY_DATA sXML_np__xforms[] = "_xforms";
-+sal_Char __READONLY_DATA sXML_np__formx[] = "_formx";
- sal_Char __READONLY_DATA sXML_np__xsd[] = "_xsd";
- sal_Char __READONLY_DATA sXML_np__xsi[] = "_xsi";
- sal_Char __READONLY_DATA sXML_np__field[] = "_field";
-@@ -287,6 +288,9 @@ void SvXMLImport::_InitCtor()
- mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xforms) ),
- GetXMLToken(XML_N_XFORMS_1_0),
- XML_NAMESPACE_XFORMS );
-+ mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__formx) ),
-+ GetXMLToken( XML_N_FORMX ),
-+ XML_NAMESPACE_FORMX );
- mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xsd) ),
- GetXMLToken(XML_N_XSD),
- XML_NAMESPACE_XSD );
-diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
-index bed0d4c..651a3d4 100644
---- xmloff/source/core/xmltoken.cxx
-+++ xmloff/source/core/xmltoken.cxx
-@@ -150,6 +150,10 @@ namespace xmloff { namespace token {
- TOKEN( "rdfa", XML_NP_RDFA ),
- TOKEN( "http://docs.oasis-open.org/opendocument/meta/rdfa#";, XML_N_RDFA ),
-
-+ // jonp: 2008-09-24 Excel Interop
-+ TOKEN( "formx", XML_NP_FORMX ),
-+ TOKEN( "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", XML_N_FORMX ),
-+
- // units
- TOKEN( "mm", XML_UNIT_MM ),
- TOKEN( "m", XML_UNIT_M ),
-Index: xmloff/source/forms/formattributes.hxx
-===================================================================
-RCS file: /cvs/xml/xmloff/source/forms/formattributes.hxx,v
-retrieving revision 1.14
-diff -u -p -r1.14 formattributes.hxx
---- xmloff/source/forms/formattributes.hxx 10 Apr 2008 22:03:59 -0000 1.14
-+++ xmloff/source/forms/formattributes.hxx 6 Jun 2008 20:18:57 -0000
-@@ -124,6 +125,7 @@ namespace xmloff
- #define SCA_MAX_VALUE 0x00000002
- #define SCA_MIN_VALUE 0x00000004
- #define SCA_VALIDATION 0x00000008
-+ #define SCA_GROUP_NAME 0x00000010
- #define SCA_MULTI_LINE 0x00000020
- #define SCA_AUTOMATIC_COMPLETION 0x00000080
- #define SCA_MULTIPLE 0x00000100
-Index: xmloff/source/forms/formattributes.cxx
-===================================================================
-RCS file: /cvs/xml/xmloff/source/forms/formattributes.cxx,v
-retrieving revision 1.21
-diff -u -p -r1.21 formattributes.cxx
---- xmloff/source/forms/formattributes.cxx 10 Apr 2008 22:03:42 -0000 1.21
-+++ xmloff/source/forms/formattributes.cxx 6 Jun 2008 20:18:58 -0000
-@@ -193,6 +194,7 @@ namespace xmloff
- case SCA_MAX_VALUE: return "max-value";
- case SCA_MIN_VALUE: return "min-value";
- case SCA_VALIDATION: return "validation";
-+ case SCA_GROUP_NAME: return "group-name";
- case SCA_MULTI_LINE: return "multi-line";
- case SCA_AUTOMATIC_COMPLETION: return "auto-complete";
- case SCA_MULTIPLE: return "multiple";
-@@ -215,9 +215,12 @@ namespace xmloff
- }
-
- //---------------------------------------------------------------------
-- sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 /*_nId*/)
-+ sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 _nId)
- {
-- // nothing special here
-+ switch( _nId )
-+ {
-+ case SCA_GROUP_NAME: return XML_NAMESPACE_FORMX;
-+ }
- return XML_NAMESPACE_FORM;
- }
-
-diff --git xmloff/source/forms/layerimport.cxx xmloff/source/forms/layerimport.cxx
-index e8d8a26..8f8513c 100644
---- xmloff/source/forms/layerimport.cxx
-+++ xmloff/source/forms/layerimport.cxx
-@@ -97,6 +97,8 @@ namespace xmloff
- m_aAttributeMetaData.addStringProperty(
- OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), PROPERTY_NAME);
- m_aAttributeMetaData.addStringProperty(
-+ OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), PROPERTY_GROUP_NAME);
-+ m_aAttributeMetaData.addStringProperty(
- OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), PROPERTY_IMAGEURL);
- m_aAttributeMetaData.addStringProperty(
- OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), PROPERTY_LABEL);
-Index: xmloff/source/forms/strings.hxx
-===================================================================
-RCS file: /cvs/xml/xmloff/source/forms/strings.hxx,v
-retrieving revision 1.18
-diff -u -p -r1.18 strings.hxx
---- xmloff/source/forms/strings.hxx 10 Apr 2008 22:12:05 -0000 1.18
-+++ xmloff/source/forms/strings.hxx 6 Jun 2008 20:18:59 -0000
-@@ -204,6 +205,7 @@ namespace xmloff
- XMLFORM_CONSTASCII_STRING( PROPERTY_VISUAL_EFFECT, "VisualEffect");
- XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION, "ImagePosition");
- XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_ALIGN, "ImageAlign");
-+ XMLFORM_CONSTASCII_STRING( PROPERTY_GROUP_NAME, "GroupName");
-
- XMLFORM_CONSTASCII_STRING( PROPERTY_BOUND_CELL, "BoundCell");
- XMLFORM_CONSTASCII_STRING( PROPERTY_LIST_CELL_RANGE, "CellRange");
-Index: xmloff/source/forms/elementexport.cxx
-===================================================================
-RCS file: /cvs/xml/xmloff/source/forms/elementexport.cxx,v
-retrieving revision 1.48
-diff -u -p -r1.48 elementexport.cxx
---- xmloff/source/forms/elementexport.cxx 10 Apr 2008 22:00:18 -0000 1.48
-+++ xmloff/source/forms/elementexport.cxx 6 Jun 2008 20:19:00 -0000
-@@ -1110,6 +1110,39 @@ namespace xmloff
- }
-
- // ----------------------------------
-+ // the string properties
-+ {
-+ static sal_Int32 nStringPropertyAttributeIds[] =
-+ { // attribute flags
-+ SCA_GROUP_NAME
-+ };
-+ static const ::rtl::OUString* pStringPropertyNames[] =
-+ { // property names
-+ &PROPERTY_GROUP_NAME
-+ };
-+
-+ sal_Int32 nIdCount = sizeof( nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
-+ #if OSL_DEBUG_LEVEL > 0
-+ sal_Int32 nNameCount = sizeof( pStringPropertyNames ) / sizeof( pStringPropertyNames[0] );
-+ OSL_ENSURE( ( nIdCount == nNameCount ),
-+ "OControlExport::exportSpecialAttributes: somebody tampered with the maps (2)!" );
-+ #endif
-+ for ( i = 0; i < nIdCount; ++i )
-+ if ( nStringPropertyAttributeIds[i] & m_nIncludeSpecial )
-+ {
-+ exportStringPropertyAttribute(
-+ OAttributeMetaData::getSpecialAttributeNamespace( nStringPropertyAttributeIds[i] ),
-+ OAttributeMetaData::getSpecialAttributeName( nStringPropertyAttributeIds[i] ),
-+ *( pStringPropertyNames[i] )
-+ );
-+ #if OSL_DEBUG_LEVEL > 0
-+ // reset the bit for later checking
-+ m_nIncludeSpecial = m_nIncludeSpecial & ~nStringPropertyAttributeIds[i];
-+ #endif
-+ }
-+ }
-+
-+ // ----------------------------------
- if ((SCA_MIN_VALUE | SCA_MAX_VALUE) & m_nIncludeSpecial)
- {
- // need to export the min value and the max value as attributes
-@@ -1569,6 +1602,8 @@ namespace xmloff
- }
- if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_IMAGE_POSITION ) )
- m_nIncludeSpecial |= SCA_IMAGE_POSITION;
-+ if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_GROUP_NAME ) )
-+ m_nIncludeSpecial |= SCA_GROUP_NAME;
- m_nIncludeDatabase = DA_DATA_FIELD;
- m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
- break;
-Index: svx/source/msfilter/msocximex.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/msfilter/msocximex.cxx,v
-retrieving revision 1.37
-diff -u -p -r1.37 msocximex.cxx
---- svx/source/msfilter/msocximex.cxx 11 Apr 2008 02:06:31 -0000 1.37
-+++ svx/source/msfilter/msocximex.cxx 6 Jun 2008 20:19:02 -0000
-@@ -1701,6 +1701,12 @@ sal_Bool OCX_OptionButton::Import(com::s
+diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
+index c278bc9..bb2338f 100644
+--- svx/source/msfilter/msocximex.cxx
++++ svx/source/msfilter/msocximex.cxx
+@@ -1709,6 +1709,12 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
aTmp <<= ::com::sun::star::style::VerticalAlignment_MIDDLE;
rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
@@ -686,55 +442,10 @@
aFontData.Import(rPropSet);
return sal_True;
}
-diff --git toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx
-index f257f5c..3577148 100644
---- toolkit/inc/toolkit/helper/property.hxx
-+++ toolkit/inc/toolkit/helper/property.hxx
-@@ -192,6 +192,7 @@ namespace rtl {
- #define BASEPROPERTY_UNIT 135 // ::awt::FieldUnit
- #define BASEPROPERTY_CUSTOMUNITTEXT 136 // ::rtl::OUString
- #define BASEPROPERTY_ENABLEVISIBLE 137 // sal_Bool
-+#define BASEPROPERTY_GROUPNAME 138 // ::rtl::OUString
-
- // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
- #define BASEPROPERTY_FONTDESCRIPTORPART_START 1000
-Index: toolkit/source/helper/property.cxx
-===================================================================
-RCS file: /cvs/gsl/toolkit/source/helper/property.cxx,v
-retrieving revision 1.42
-diff -u -p -r1.42 property.cxx
---- toolkit/source/helper/property.cxx 11 Apr 2008 09:36:59 -0000 1.42
-+++ toolkit/source/helper/property.cxx 6 Jun 2008 20:19:03 -0000
-@@ -179,6 +179,7 @@ ImplPropertyInfo* ImplGetPropertyInfos(
- DECL_PROP_3 ( "FormatsSupplier", FORMATSSUPPLIER, Reference< ::com::sun::star::util::XNumberFormatsSupplier >, BOUND, MAYBEVOID, TRANSIENT ),
-
- DECL_PROP_2 ( "Graphic", GRAPHIC, Reference< ::com::sun::star::graphic::XGraphic >, BOUND, TRANSIENT ),
-+ DECL_PROP_2 ( "GroupName", GROUPNAME, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
- DECL_PROP_2 ( "HelpText", HELPTEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
- DECL_PROP_2 ( "HelpURL", HELPURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
- DECL_PROP_2 ( "HideInactiveSelection", HIDEINACTIVESELECTION, bool, BOUND, MAYBEDEFAULT ),
-Index: toolkit/source/awt/vclxwindows.cxx
-===================================================================
-RCS file: /cvs/gsl/toolkit/source/awt/vclxwindows.cxx,v
-retrieving revision 1.68
-diff -u -p -r1.68 vclxwindows.cxx
---- toolkit/source/awt/vclxwindows.cxx 11 Apr 2008 09:22:58 -0000 1.68
-+++ toolkit/source/awt/vclxwindows.cxx 6 Jun 2008 20:19:05 -0000
-@@ -1079,6 +1079,7 @@ void VCLXRadioButton::ImplGetPropertyIds
- BASEPROPERTY_BACKGROUNDCOLOR,
- BASEPROPERTY_ALIGN,
- BASEPROPERTY_VERTICALALIGN,
-+ BASEPROPERTY_GROUPNAME,
- 0);
- VCLXImageConsumer::ImplGetPropertyIds( rIds );
- }
-Index: toolkit/inc/toolkit/controls/dialogcontrol.hxx
-===================================================================
-RCS file: /cvs/gsl/toolkit/inc/toolkit/controls/dialogcontrol.hxx,v
-retrieving revision 1.9
-diff -u -p -r1.9 dialogcontrol.hxx
---- toolkit/inc/toolkit/controls/dialogcontrol.hxx 11 Apr 2008 08:52:41 -0000 1.9
-+++ toolkit/inc/toolkit/controls/dialogcontrol.hxx 6 Jun 2008 20:19:06 -0000
+diff --git toolkit/inc/toolkit/controls/dialogcontrol.hxx toolkit/inc/toolkit/controls/dialogcontrol.hxx
+index 1e65e6f..1301975 100644
+--- toolkit/inc/toolkit/controls/dialogcontrol.hxx
++++ toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -51,6 +51,7 @@
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -758,13 +469,34 @@
};
// ----------------------------------------------------
-Index: toolkit/source/controls/dialogcontrol.cxx
-===================================================================
-RCS file: /cvs/gsl/toolkit/source/controls/dialogcontrol.cxx,v
-retrieving revision 1.27
-diff -u -p -r1.27 dialogcontrol.cxx
---- toolkit/source/controls/dialogcontrol.cxx 11 Apr 2008 09:24:40 -0000 1.27
-+++ toolkit/source/controls/dialogcontrol.cxx 6 Jun 2008 20:19:08 -0000
+diff --git toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx
+index 325871d..1feb7b8 100644
+--- toolkit/inc/toolkit/helper/property.hxx
++++ toolkit/inc/toolkit/helper/property.hxx
+@@ -190,6 +190,7 @@ namespace rtl {
+ #define BASEPROPERTY_CUSTOMUNITTEXT 136 // ::rtl::OUString
+ #define BASEPROPERTY_IMAGE_SCALE_MODE 137
+ #define BASEPROPERTY_ENABLEVISIBLE 138 // sal_Bool
++#define BASEPROPERTY_GROUPNAME 138 // ::rtl::OUString
+
+ // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
+ #define BASEPROPERTY_FONTDESCRIPTORPART_START 1000
+diff --git toolkit/source/awt/vclxwindows.cxx toolkit/source/awt/vclxwindows.cxx
+index 5909248..99144fe 100644
+--- toolkit/source/awt/vclxwindows.cxx
++++ toolkit/source/awt/vclxwindows.cxx
+@@ -1097,6 +1097,7 @@ void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+ BASEPROPERTY_BACKGROUNDCOLOR,
+ BASEPROPERTY_ALIGN,
+ BASEPROPERTY_VERTICALALIGN,
++ BASEPROPERTY_GROUPNAME,
+ 0);
+ VCLXImageConsumer::ImplGetPropertyIds( rIds );
+ }
+diff --git toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/dialogcontrol.cxx
+index 0aebfb8..3fd5723 100644
+--- toolkit/source/controls/dialogcontrol.cxx
++++ toolkit/source/controls/dialogcontrol.cxx
@@ -142,6 +142,18 @@ namespace
return xGraphic;
}
@@ -784,7 +516,7 @@
}
// ----------------------------------------------------------------------------
-@@ -897,6 +909,63 @@ void UnoControlDialogModel::implNotifyTa
+@@ -897,6 +909,63 @@ void UnoControlDialogModel::implNotifyTabModelChange( const ::rtl::OUString& _rA
}
}
@@ -848,7 +580,7 @@
// ----------------------------------------------------------------------------
void UnoControlDialogModel::implUpdateGroupStructure()
-@@ -921,10 +990,13 @@ void UnoControlDialogModel::implUpdateGr
+@@ -921,10 +990,13 @@ void UnoControlDialogModel::implUpdateGroupStructure()
GroupingMachineState eState = eLookingForGroup; // the current state of our machine
Reference< XServiceInfo > xModelSI; // for checking for a radion button
@@ -864,7 +596,7 @@
#if OSL_DEBUG_LEVEL > 1
::std::vector< ::rtl::OUString > aCurrentGroupLabels;
#endif
-@@ -945,14 +1017,8 @@ void UnoControlDialogModel::implUpdateGr
+@@ -945,14 +1017,8 @@ void UnoControlDialogModel::implUpdateGroupStructure()
// the current model is a radio button
// -> we found the beginning of a new group
// create the place for this group
@@ -873,14 +605,15 @@
- aCurrentGroup = maGroups.begin() + nGroups;
- // and add the (only, til now) member
- aCurrentGroup->push_back( *pControlModels );
-+ AddRadioButtonToGroup( *pControlModels, GROUP_NAME, aNamedGroups, aCurrentGroup );
-
+-
- // get the step which all controls of this group now have to belong to
- nCurrentGroupStep = lcl_getDialogStep( *pControlModels );
++ AddRadioButtonToGroup( *pControlModels, GROUP_NAME, aNamedGroups, aCurrentGroup );
++
// new state: looking for further members
eState = eExpandingGroup;
-@@ -970,7 +1036,7 @@ void UnoControlDialogModel::implUpdateGr
+@@ -970,7 +1036,7 @@ void UnoControlDialogModel::implUpdateGroupStructure()
{
if ( !bIsRadioButton )
{ // no radio button -> the group is done
@@ -889,7 +622,7 @@
eState = eLookingForGroup;
#if OSL_DEBUG_LEVEL > 1
aCurrentGroupLabels.clear();
-@@ -978,48 +1044,9 @@ void UnoControlDialogModel::implUpdateGr
+@@ -978,48 +1044,9 @@ void UnoControlDialogModel::implUpdateGroupStructure()
continue;
}
@@ -939,7 +672,7 @@
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
::rtl::OUString sLabel;
if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
-@@ -1031,6 +1058,7 @@ void UnoControlDialogModel::implUpdateGr
+@@ -1031,6 +1058,7 @@ void UnoControlDialogModel::implUpdateGroupStructure()
}
}
@@ -948,14 +681,219 @@
}
diff --git toolkit/source/controls/unocontrolmodel.cxx toolkit/source/controls/unocontrolmodel.cxx
-index 25573a4..8768094 100644
+index 61e3ea3..e7939a9 100644
--- toolkit/source/controls/unocontrolmodel.cxx
+++ toolkit/source/controls/unocontrolmodel.cxx
-@@ -341,6 +341,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
- case BASEPROPERTY_VISIBLE:
+@@ -340,6 +340,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
+ case BASEPROPERTY_ENABLEVISIBLE:
case BASEPROPERTY_DECORATION: aDefault <<= (sal_Bool) sal_True; break;
+ case BASEPROPERTY_GROUPNAME:
case BASEPROPERTY_HELPTEXT:
case BASEPROPERTY_HELPURL:
case BASEPROPERTY_IMAGEURL:
+diff --git toolkit/source/helper/property.cxx toolkit/source/helper/property.cxx
+index 933a72b..b5d38b5 100644
+--- toolkit/source/helper/property.cxx
++++ toolkit/source/helper/property.cxx
+@@ -179,6 +179,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
+ DECL_PROP_3 ( "FormatsSupplier", FORMATSSUPPLIER, Reference< ::com::sun::star::util::XNumberFormatsSupplier >, BOUND, MAYBEVOID, TRANSIENT ),
+
+ DECL_PROP_2 ( "Graphic", GRAPHIC, Reference< ::com::sun::star::graphic::XGraphic >, BOUND, TRANSIENT ),
++ DECL_PROP_2 ( "GroupName", GROUPNAME, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
+ DECL_PROP_2 ( "HelpText", HELPTEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
+ DECL_PROP_2 ( "HelpURL", HELPURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
+ DECL_PROP_2 ( "HideInactiveSelection", HIDEINACTIVESELECTION, bool, BOUND, MAYBEDEFAULT ),
+diff --git xmloff/inc/xmlnmspe.hxx xmloff/inc/xmlnmspe.hxx
+index 060a5a5..88516fe 100644
+--- xmloff/inc/xmlnmspe.hxx
++++ xmloff/inc/xmlnmspe.hxx
+@@ -95,6 +95,7 @@ XML_OLD_NAMESPACE( META, 6U )
+
+ // experimental namespaces
+ XML_NAMESPACE( FIELD, 100U )
++XML_NAMESPACE( FORMX, 101U ) // form interop extensions
+
+
+ #endif // _XMLOFF_XMLNMSPE_HXX
+diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
+index 602ad2d..896daa4 100644
+--- xmloff/inc/xmloff/xmltoken.hxx
++++ xmloff/inc/xmloff/xmltoken.hxx
+@@ -142,6 +142,10 @@ namespace xmloff { namespace token {
+ XML_NP_RDFA,
+ XML_N_RDFA,
+
++ // jonp: 2008-09-24 Excel Interop
++ XML_NP_FORMX,
++ XML_N_FORMX,
++
+ // units
+ XML_UNIT_MM,
+ XML_UNIT_M,
+diff --git xmloff/source/core/xmlexp.cxx xmloff/source/core/xmlexp.cxx
+index dfb9c97..d2fe699 100644
+--- xmloff/source/core/xmlexp.cxx
++++ xmloff/source/core/xmlexp.cxx
+@@ -307,6 +307,7 @@ void SvXMLExport::_InitCtor()
+ mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD );
+ mpNamespaceMap->Add( GetXMLToken(XML_NP_XSI), GetXMLToken(XML_N_XSI), XML_NAMESPACE_XSI );
+ mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
++ mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX );
+ }
+ if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+ {
+diff --git xmloff/source/core/xmlimp.cxx xmloff/source/core/xmlimp.cxx
+index e3b116c..a827e5b 100644
+--- xmloff/source/core/xmlimp.cxx
++++ xmloff/source/core/xmlimp.cxx
+@@ -108,6 +108,7 @@ sal_Char __READONLY_DATA sXML_np__script[] = "_script";
+ sal_Char __READONLY_DATA sXML_np__config[] = "_config";
+ sal_Char __READONLY_DATA sXML_np__db[] = "_db";
+ sal_Char __READONLY_DATA sXML_np__xforms[] = "_xforms";
++sal_Char __READONLY_DATA sXML_np__formx[] = "_formx";
+ sal_Char __READONLY_DATA sXML_np__xsd[] = "_xsd";
+ sal_Char __READONLY_DATA sXML_np__xsi[] = "_xsi";
+ sal_Char __READONLY_DATA sXML_np__field[] = "_field";
+@@ -283,6 +284,9 @@ void SvXMLImport::_InitCtor()
+ mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xforms) ),
+ GetXMLToken(XML_N_XFORMS_1_0),
+ XML_NAMESPACE_XFORMS );
++ mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__formx) ),
++ GetXMLToken( XML_N_FORMX ),
++ XML_NAMESPACE_FORMX );
+ mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xsd) ),
+ GetXMLToken(XML_N_XSD),
+ XML_NAMESPACE_XSD );
+diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
+index 620680d..4170532 100644
+--- xmloff/source/core/xmltoken.cxx
++++ xmloff/source/core/xmltoken.cxx
+@@ -150,6 +150,10 @@ namespace xmloff { namespace token {
+ TOKEN( "rdfa", XML_NP_RDFA ),
+ TOKEN( "http://docs.oasis-open.org/opendocument/meta/rdfa#";, XML_N_RDFA ),
+
++ // jonp: 2008-09-24 Excel Interop
++ TOKEN( "formx", XML_NP_FORMX ),
++ TOKEN( "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", XML_N_FORMX ),
++
+ // units
+ TOKEN( "mm", XML_UNIT_MM ),
+ TOKEN( "m", XML_UNIT_M ),
+diff --git xmloff/source/forms/elementexport.cxx xmloff/source/forms/elementexport.cxx
+index 357b434..cb859fb 100644
+--- xmloff/source/forms/elementexport.cxx
++++ xmloff/source/forms/elementexport.cxx
+@@ -1113,6 +1113,39 @@ namespace xmloff
+ }
+
+ // ----------------------------------
++ // the string properties
++ {
++ static sal_Int32 nStringPropertyAttributeIds[] =
++ { // attribute flags
++ SCA_GROUP_NAME
++ };
++ static const ::rtl::OUString* pStringPropertyNames[] =
++ { // property names
++ &PROPERTY_GROUP_NAME
++ };
++
++ sal_Int32 nIdCount = sizeof( nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
++ #if OSL_DEBUG_LEVEL > 0
++ sal_Int32 nNameCount = sizeof( pStringPropertyNames ) / sizeof( pStringPropertyNames[0] );
++ OSL_ENSURE( ( nIdCount == nNameCount ),
++ "OControlExport::exportSpecialAttributes: somebody tampered with the maps (2)!" );
++ #endif
++ for ( i = 0; i < nIdCount; ++i )
++ if ( nStringPropertyAttributeIds[i] & m_nIncludeSpecial )
++ {
++ exportStringPropertyAttribute(
++ OAttributeMetaData::getSpecialAttributeNamespace( nStringPropertyAttributeIds[i] ),
++ OAttributeMetaData::getSpecialAttributeName( nStringPropertyAttributeIds[i] ),
++ *( pStringPropertyNames[i] )
++ );
++ #if OSL_DEBUG_LEVEL > 0
++ // reset the bit for later checking
++ m_nIncludeSpecial = m_nIncludeSpecial & ~nStringPropertyAttributeIds[i];
++ #endif
++ }
++ }
++
++ // ----------------------------------
+ if ((SCA_MIN_VALUE | SCA_MAX_VALUE) & m_nIncludeSpecial)
+ {
+ // need to export the min value and the max value as attributes
+@@ -1570,6 +1603,8 @@ namespace xmloff
+ }
+ if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_IMAGE_POSITION ) )
+ m_nIncludeSpecial |= SCA_IMAGE_POSITION;
++ if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_GROUP_NAME ) )
++ m_nIncludeSpecial |= SCA_GROUP_NAME;
+ m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
+ m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
+ break;
+diff --git xmloff/source/forms/formattributes.cxx xmloff/source/forms/formattributes.cxx
+index 4314711..5df31ed 100644
+--- xmloff/source/forms/formattributes.cxx
++++ xmloff/source/forms/formattributes.cxx
+@@ -195,6 +195,7 @@ namespace xmloff
+ case SCA_MAX_VALUE: return "max-value";
+ case SCA_MIN_VALUE: return "min-value";
+ case SCA_VALIDATION: return "validation";
++ case SCA_GROUP_NAME: return "group-name";
+ case SCA_MULTI_LINE: return "multi-line";
+ case SCA_AUTOMATIC_COMPLETION: return "auto-complete";
+ case SCA_MULTIPLE: return "multiple";
+@@ -215,9 +216,12 @@ namespace xmloff
+ }
+
+ //---------------------------------------------------------------------
+- sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 /*_nId*/)
++ sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 _nId)
+ {
+- // nothing special here
++ switch( _nId )
++ {
++ case SCA_GROUP_NAME: return XML_NAMESPACE_FORMX;
++ }
+ return XML_NAMESPACE_FORM;
+ }
+
+diff --git xmloff/source/forms/formattributes.hxx xmloff/source/forms/formattributes.hxx
+index 50bad1b..ef6e7eb 100644
+--- xmloff/source/forms/formattributes.hxx
++++ xmloff/source/forms/formattributes.hxx
+@@ -126,6 +126,7 @@ namespace xmloff
+ #define SCA_MAX_VALUE 0x00000002
+ #define SCA_MIN_VALUE 0x00000004
+ #define SCA_VALIDATION 0x00000008
++ #define SCA_GROUP_NAME 0x00000010
+ #define SCA_MULTI_LINE 0x00000020
+ #define SCA_AUTOMATIC_COMPLETION 0x00000080
+ #define SCA_MULTIPLE 0x00000100
+diff --git xmloff/source/forms/layerimport.cxx xmloff/source/forms/layerimport.cxx
+index 4381ddd..cf73233 100644
+--- xmloff/source/forms/layerimport.cxx
++++ xmloff/source/forms/layerimport.cxx
+@@ -97,6 +97,8 @@ namespace xmloff
+ m_aAttributeMetaData.addStringProperty(
+ OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), PROPERTY_NAME);
+ m_aAttributeMetaData.addStringProperty(
++ OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), PROPERTY_GROUP_NAME);
++ m_aAttributeMetaData.addStringProperty(
+ OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), PROPERTY_IMAGEURL);
+ m_aAttributeMetaData.addStringProperty(
+ OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), PROPERTY_LABEL);
+diff --git xmloff/source/forms/strings.hxx xmloff/source/forms/strings.hxx
+index 5b992ef..b067c7b 100644
+--- xmloff/source/forms/strings.hxx
++++ xmloff/source/forms/strings.hxx
+@@ -207,6 +207,7 @@ namespace xmloff
+ XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION, "ImagePosition");
+ XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_ALIGN, "ImageAlign");
+ XMLFORM_CONSTASCII_STRING( PROPERTY_SCALE_IMAGE, "ScaleImage");
++ XMLFORM_CONSTASCII_STRING( PROPERTY_GROUP_NAME, "GroupName");
+
+ XMLFORM_CONSTASCII_STRING( PROPERTY_BOUND_CELL, "BoundCell");
+ XMLFORM_CONSTASCII_STRING( PROPERTY_LIST_CELL_RANGE, "CellRange");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
