ooo-build r14962 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14962 - in trunk: . patches/dev300
- Date: Mon, 29 Dec 2008 22:32:36 +0000 (UTC)
Author: kyoshida
Date: Mon Dec 29 22:32:36 2008
New Revision: 14962
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14962&view=rev
Log:
2008-12-29 Kohei Yoshida <kyoshida novell com>
* patches/dev300/form-control-visibility-m37.diff:
* patches/dev300/form-control-visibility.diff:
* patches/dev300/apply: re-enabled this patch for dev300-m38; was
formerly FIXME_m38.
Added:
trunk/patches/dev300/form-control-visibility-m37.diff (props changed)
- copied unchanged from r14946, /trunk/patches/dev300/form-control-visibility.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/form-control-visibility.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Mon Dec 29 22:32:36 2008
@@ -485,11 +485,11 @@
[ Fixes == dev300-m37 ]
# import/export form control's visibility
-form-control-visibility.diff, i#88878, jianhua
+form-control-visibility-m37.diff, i#88878, jianhua
[ Fixes > dev300-m37 ]
# import/export form control's visibility
-#FIXME_m38 form-control-visibility.diff, i#88878, jianhua
+form-control-visibility.diff, i#88878, jianhua
[ Fixes ]
Modified: trunk/patches/dev300/form-control-visibility.diff
==============================================================================
--- trunk/patches/dev300/form-control-visibility.diff (original)
+++ trunk/patches/dev300/form-control-visibility.diff Mon Dec 29 22:32:36 2008
@@ -1,90 +1,31 @@
---- xmloff/source/forms/strings.hxx.orig 2008-06-04 15:22:46.000000000 +0800
-+++ xmloff/source/forms/strings.hxx 2008-06-04 15:23:11.000000000 +0800
-@@ -114,6 +114,7 @@ namespace xmloff
- XMLFORM_CONSTASCII_STRING( PROPERTY_TABSTOP, "Tabstop" );
- XMLFORM_CONSTASCII_STRING( PROPERTY_STATE, "State" );
- XMLFORM_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled" );
-+ XMLFORM_CONSTASCII_STRING( PROPERTY_ENABLEVISIBLE, "EnableVisible" );
- XMLFORM_CONSTASCII_STRING( PROPERTY_MAXTEXTLENGTH, "MaxTextLen" );
- XMLFORM_CONSTASCII_STRING( PROPERTY_LINECOUNT, "LineCount" );
- XMLFORM_CONSTASCII_STRING( PROPERTY_TABINDEX, "TabIndex" );
---- xmloff/source/forms/formattributes.hxx.orig 2008-06-04 15:22:46.000000000 +0800
-+++ xmloff/source/forms/formattributes.hxx 2008-06-04 15:23:11.000000000 +0800
-@@ -69,6 +69,7 @@ namespace xmloff
- #define CCA_VALUE 0x00200000
- #define CCA_ORIENTATION 0x00400000
- #define CCA_VISUAL_EFFECT 0x00800000
-+ #define CCA_ENABLEVISIBLE 0x01000000
-
- // flags for database control atttributes
- #define DA_BOUND_COLUMN 0x00000001
---- xmloff/source/forms/formattributes.cxx.orig 2008-06-04 15:22:46.000000000 +0800
-+++ xmloff/source/forms/formattributes.cxx 2008-06-04 15:23:11.000000000 +0800
-@@ -60,6 +60,7 @@ namespace xmloff
- case CCA_CURRENT_SELECTED: return "current-selected";
- case CCA_CURRENT_VALUE: return "current-value";
- case CCA_DISABLED: return "disabled";
-+ case CCA_ENABLEVISIBLE: return "enablevisible";
- case CCA_DROPDOWN: return "dropdown";
- case CCA_FOR: return "for";
- case CCA_IMAGE_DATA: return "image-data";
---- xmloff/source/forms/elementexport.cxx.orig 2008-06-04 15:22:46.000000000 +0800
-+++ xmloff/source/forms/elementexport.cxx 2008-06-04 15:23:11.000000000 +0800
-@@ -523,15 +523,15 @@ namespace xmloff
- {
- static sal_Int32 nBooleanPropertyAttributeIds[] =
- { // attribute flags
-- CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP
-+ CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP, CCA_ENABLEVISIBLE
- };
- static const ::rtl::OUString* pBooleanPropertyNames[] =
- { // property names
-- &PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP
-+ &PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP, &PROPERTY_ENABLEVISIBLE
- };
- static sal_Bool nBooleanPropertyAttrFlags[] =
- { // attribute defaults
-- BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID
-+ BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID, BOOLATTR_DEFAULT_FALSE
- };
- #if OSL_DEBUG_LEVEL > 0
- sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
---- toolkit/inc/toolkit/helper/property.hxx.orig 2008-05-20 22:32:24.000000000 +0800
-+++ toolkit/inc/toolkit/helper/property.hxx 2008-06-04 15:24:06.000000000 +0800
-@@ -188,6 +188,7 @@ namespace rtl {
- #define BASEPROPERTY_UNIT 135 // ::awt::FieldUnit
- #define BASEPROPERTY_CUSTOMUNITTEXT 136 // ::rtl::OUString
+diff --git toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx
+index 30a7a89..238b412 100644
+--- toolkit/inc/toolkit/helper/property.hxx
++++ toolkit/inc/toolkit/helper/property.hxx
+@@ -191,6 +191,7 @@ namespace rtl {
#define BASEPROPERTY_IMAGE_SCALE_MODE 137
-+#define BASEPROPERTY_ENABLEVISIBLE 138 // sal_Bool
+ #define BASEPROPERTY_WRITING_MODE 138
+ #define BASEPROPERTY_CONTEXT_WRITING_MODE 139
++#define BASEPROPERTY_ENABLEVISIBLE 140 // sal_Bool
// Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
#define BASEPROPERTY_FONTDESCRIPTORPART_START 1000
---- toolkit/source/helper/property.cxx.orig 2008-04-11 17:36:59.000000000 +0800
-+++ toolkit/source/helper/property.cxx 2008-06-04 15:23:11.000000000 +0800
-@@ -269,7 +269,8 @@ ImplPropertyInfo* ImplGetPropertyInfos(
- DECL_PROP_3 ( "RowHeight", TREE_ROWHEIGHT, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ),
- DECL_PROP_2 ( "InvokesStopNodeEditing", TREE_INVOKESSTOPNODEEDITING, sal_Bool, BOUND, MAYBEDEFAULT ),
- DECL_PROP_2 ( "DialogSourceURL", DIALOGSOURCEURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
-- DECL_PROP_2 ( "URL", URL, ::rtl::OUString, BOUND, MAYBEDEFAULT )
-+ DECL_PROP_2 ( "URL", URL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
-+ DECL_PROP_2 ( "EnableVisible", ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT )
- };
- pPropertyInfos = aImplPropertyInfos;
- nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
---- toolkit/source/awt/vclxwindow.cxx.orig 2008-05-14 17:47:01.000000000 +0800
-+++ toolkit/source/awt/vclxwindow.cxx 2008-06-04 15:23:11.000000000 +0800
-@@ -207,6 +207,8 @@ private:
- ::vos::IMutex& mrMutex;
+diff --git toolkit/source/awt/vclxwindow.cxx toolkit/source/awt/vclxwindow.cxx
+index 3a6a2e2..90c1337 100644
+--- toolkit/source/awt/vclxwindow.cxx
++++ toolkit/source/awt/vclxwindow.cxx
+@@ -226,6 +226,8 @@ private:
::toolkit::AccessibilityClient maAccFactory;
bool mbDisposed;
+ bool mbDrawingOntoParent; // no bit mask, is passed around by reference
+ sal_Bool mbEnableVisible;
+ sal_Bool mbDirectVisible;
+
::osl::Mutex maListenerContainerMutex;
::cppu::OInterfaceContainerHelper maWindow2Listeners;
-
-@@ -228,6 +230,15 @@ public:
+@@ -273,6 +275,15 @@ public:
*/
- VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::vos::IMutex& _rMutex );
+ VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::vos::IMutex& _rMutex, bool _bWithDefaultProps );
+ /** synchronously mbEnableVisible
+ */
@@ -98,16 +39,16 @@
/** asynchronously notifies a mouse event to the VCLXWindow's XMouseListeners
*/
void notifyMouseEvent( const awt::MouseEvent& _rMouseEvent, MouseEventType _nType );
-@@ -298,6 +309,8 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWind
- ,mrAntiImpl( _rAntiImpl )
+@@ -347,6 +358,8 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::vos::IMutex& _rMutex,
,mrMutex( _rMutex )
,mbDisposed( false )
+ ,mbDrawingOntoParent( false )
+ ,mbEnableVisible(sal_True)
+ ,mbDirectVisible(sal_True)
,maListenerContainerMutex( )
,maWindow2Listeners( maListenerContainerMutex )
- #ifdef THREADED_NOTIFICATION
-@@ -600,7 +613,12 @@ void VCLXWindow::SetWindow( Window* pWin
+ ,maDockableWindowListeners( maListenerContainerMutex )
+@@ -623,7 +636,12 @@ void VCLXWindow::SetWindow( Window* pWindow )
SetOutputDevice( pWindow );
if ( GetWindow() )
@@ -120,7 +61,7 @@
}
void VCLXWindow::suspendVclEventListening( )
-@@ -1223,7 +1241,13 @@ void VCLXWindow::setVisible( sal_Bool bV
+@@ -1224,7 +1242,13 @@ void VCLXWindow::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::Ru
}
}
*/
@@ -135,7 +76,7 @@
}
}
-@@ -1537,6 +1561,7 @@ void VCLXWindow::ImplGetPropertyIds( std
+@@ -1527,6 +1551,7 @@ void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDe
BASEPROPERTY_HELPURL,
BASEPROPERTY_TEXT,
BASEPROPERTY_PRINTABLE,
@@ -143,31 +84,31 @@
BASEPROPERTY_TABSTOP,
0);
-@@ -1610,6 +1635,23 @@ void VCLXWindow::setProperty( const ::rt
- setEnable( b );
- }
- break;
-+ case BASEPROPERTY_ENABLEVISIBLE:
+@@ -1670,6 +1695,23 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
+ setEnable( b );
+ }
+ break;
++ case BASEPROPERTY_ENABLEVISIBLE:
++ {
++ sal_Bool b = sal_Bool();
++ if ( Value >>= b )
+ {
-+ sal_Bool b = sal_Bool();
-+ if ( Value >>= b )
++ if( b != mpImpl->isEnableVisible() )
+ {
-+ if( b != mpImpl->isEnableVisible() )
-+ {
-+ mpImpl->setEnableVisible( b );
-+ // if mbEnableVisible change from false to true.
-+ // it will ignore the mbDirectVisible, setVisilbe
-+ // and set mbDirectVisible as true.
-+ if( mpImpl->isDirectVisible() || b )
-+ setVisible( b );
-+ }
++ mpImpl->setEnableVisible( b );
++ // if mbEnableVisible change from false to true.
++ // it will ignore the mbDirectVisible, setVisilbe
++ // and set mbDirectVisible as true.
++ if( mpImpl->isDirectVisible() || b )
++ setVisible( b );
+ }
+ }
-+ break;
- case BASEPROPERTY_TEXT:
- case BASEPROPERTY_LABEL:
- case BASEPROPERTY_TITLE:
-@@ -2068,6 +2110,10 @@ void VCLXWindow::setProperty( const ::rt
++ }
++ break;
+ case BASEPROPERTY_TEXT:
+ case BASEPROPERTY_LABEL:
+ case BASEPROPERTY_TITLE:
+@@ -2135,6 +2177,10 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
aProp <<= (sal_Bool) GetWindow()->IsEnabled();
break;
@@ -178,7 +119,7 @@
case BASEPROPERTY_TEXT:
case BASEPROPERTY_LABEL:
case BASEPROPERTY_TITLE:
-@@ -2374,8 +2420,8 @@ void VCLXWindow::draw( sal_Int32 nX, sal
+@@ -2408,8 +2454,8 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno:
Window* pWindow = GetWindow();
if ( !pWindow )
return;
@@ -189,19 +130,11 @@
{
TabPage* pTabPage = dynamic_cast< TabPage* >( pWindow );
if ( pTabPage )
---- toolkit/source/controls/unocontrolmodel.cxx.orig 2008-04-11 17:32:33.000000000 +0800
-+++ toolkit/source/controls/unocontrolmodel.cxx 2008-06-04 15:23:11.000000000 +0800
-@@ -338,6 +338,7 @@ void UnoControlModel::ImplPropertyChange
- case BASEPROPERTY_SCALEIMAGE:
- case BASEPROPERTY_ENABLED:
- case BASEPROPERTY_PRINTABLE:
-+ case BASEPROPERTY_ENABLEVISIBLE:
- case BASEPROPERTY_DECORATION: aDefault <<= (sal_Bool) sal_True; break;
-
- case BASEPROPERTY_HELPTEXT:
---- toolkit/source/controls/unocontrol.cxx.orig 2008-06-04 15:22:46.000000000 +0800
-+++ toolkit/source/controls/unocontrol.cxx 2008-06-04 15:23:11.000000000 +0800
-@@ -1286,6 +1286,18 @@ void UnoControl::createPeer( const Refer
+diff --git toolkit/source/controls/unocontrol.cxx toolkit/source/controls/unocontrol.cxx
+index cfd9adf..74c2031 100644
+--- toolkit/source/controls/unocontrol.cxx
++++ toolkit/source/controls/unocontrol.cxx
+@@ -1292,6 +1292,18 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
}
//issue79712 ends
@@ -220,3 +153,88 @@
// Align
aPropName = GetPropertyName( BASEPROPERTY_ALIGN );
if ( xInfo->hasPropertyByName( aPropName ) )
+diff --git toolkit/source/controls/unocontrolmodel.cxx toolkit/source/controls/unocontrolmodel.cxx
+index 4ec35b3..33e7b7b 100644
+--- toolkit/source/controls/unocontrolmodel.cxx
++++ toolkit/source/controls/unocontrolmodel.cxx
+@@ -345,6 +345,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
+ case BASEPROPERTY_SCALEIMAGE:
+ case BASEPROPERTY_ENABLED:
+ case BASEPROPERTY_PRINTABLE:
++ case BASEPROPERTY_ENABLEVISIBLE:
+ case BASEPROPERTY_DECORATION: aDefault <<= (sal_Bool) sal_True; break;
+
+ case BASEPROPERTY_HELPTEXT:
+diff --git toolkit/source/helper/property.cxx toolkit/source/helper/property.cxx
+index 18956cf..0a26448 100644
+--- toolkit/source/helper/property.cxx
++++ toolkit/source/helper/property.cxx
+@@ -272,7 +272,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
+ DECL_PROP_2 ( "DialogSourceURL", DIALOGSOURCEURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
+ DECL_PROP_2 ( "URL", URL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
+ DECL_PROP_2 ( "WritingMode", WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT ),
+- DECL_PROP_3 ( "ContextWritingMode", CONTEXT_WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT )
++ DECL_PROP_3 ( "ContextWritingMode", CONTEXT_WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT ),
++ DECL_PROP_2 ( "EnableVisible", ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT )
+ };
+ pPropertyInfos = aImplPropertyInfos;
+ nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
+diff --git xmloff/source/forms/elementexport.cxx xmloff/source/forms/elementexport.cxx
+index a2dce99..357b434 100644
+--- xmloff/source/forms/elementexport.cxx
++++ xmloff/source/forms/elementexport.cxx
+@@ -529,15 +529,15 @@ namespace xmloff
+ {
+ static sal_Int32 nBooleanPropertyAttributeIds[] =
+ { // attribute flags
+- CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP
++ CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP, CCA_ENABLEVISIBLE
+ };
+ static const ::rtl::OUString* pBooleanPropertyNames[] =
+ { // property names
+- &PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP
++ &PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP, &PROPERTY_ENABLEVISIBLE
+ };
+ static sal_Bool nBooleanPropertyAttrFlags[] =
+ { // attribute defaults
+- BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID
++ BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID, BOOLATTR_DEFAULT_FALSE
+ };
+ #if OSL_DEBUG_LEVEL > 0
+ sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
+diff --git xmloff/source/forms/formattributes.cxx xmloff/source/forms/formattributes.cxx
+index 7f312f5..4314711 100644
+--- xmloff/source/forms/formattributes.cxx
++++ xmloff/source/forms/formattributes.cxx
+@@ -60,6 +60,7 @@ namespace xmloff
+ case CCA_CURRENT_SELECTED: return "current-selected";
+ case CCA_CURRENT_VALUE: return "current-value";
+ case CCA_DISABLED: return "disabled";
++ case CCA_ENABLEVISIBLE: return "enablevisible";
+ case CCA_DROPDOWN: return "dropdown";
+ case CCA_FOR: return "for";
+ case CCA_IMAGE_DATA: return "image-data";
+diff --git xmloff/source/forms/formattributes.hxx xmloff/source/forms/formattributes.hxx
+index 40f1e6a..50bad1b 100644
+--- xmloff/source/forms/formattributes.hxx
++++ xmloff/source/forms/formattributes.hxx
+@@ -69,6 +69,7 @@ namespace xmloff
+ #define CCA_VALUE 0x00200000
+ #define CCA_ORIENTATION 0x00400000
+ #define CCA_VISUAL_EFFECT 0x00800000
++ #define CCA_ENABLEVISIBLE 0x01000000
+
+ // flags for database control atttributes
+ #define DA_BOUND_COLUMN 0x00000001
+diff --git xmloff/source/forms/strings.hxx xmloff/source/forms/strings.hxx
+index eac6600..5b992ef 100644
+--- xmloff/source/forms/strings.hxx
++++ xmloff/source/forms/strings.hxx
+@@ -114,6 +114,7 @@ namespace xmloff
+ XMLFORM_CONSTASCII_STRING( PROPERTY_TABSTOP, "Tabstop" );
+ XMLFORM_CONSTASCII_STRING( PROPERTY_STATE, "State" );
+ XMLFORM_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled" );
++ XMLFORM_CONSTASCII_STRING( PROPERTY_ENABLEVISIBLE, "EnableVisible" );
+ XMLFORM_CONSTASCII_STRING( PROPERTY_MAXTEXTLENGTH, "MaxTextLen" );
+ XMLFORM_CONSTASCII_STRING( PROPERTY_LINECOUNT, "LineCount" );
+ XMLFORM_CONSTASCII_STRING( PROPERTY_TABINDEX, "TabIndex" );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
