[ooo-build-commit] .: patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                          |    1 
 patches/dev300/sfx2-style-edit-greyentry.diff |   81 ++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

New commits:
commit d4e8ea56db850000a5d271d038795404c39f3d44
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Sat Jul 24 20:37:15 2010 +0200

    Name of a style should be grayed if it cannot be renamed
    
    * patches/dev300/apply: added below patch
    * patches/dev300/sfx2-style-edit-greyentry.diff: fix for
      issue i#85003 - makes style name grey & disables cursor
      if it cannot be changed.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2614ae6..2129d75 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3663,3 +3663,4 @@ sd-pptx-export-build-fix-2.diff, rodo
 oox-import-fix-ole2-shapes.diff, n#593611, rodo
 upgrade-zlib-to-1.2.3.diff, fridrich
 svx-fix-layout-build.diff, rodo
+sfx2-style-edit-greyentry.diff, i#85003, simonaw
diff --git a/patches/dev300/sfx2-style-edit-greyentry.diff b/patches/dev300/sfx2-style-edit-greyentry.diff
new file mode 100644
index 0000000..a86d893
--- /dev/null
+++ b/patches/dev300/sfx2-style-edit-greyentry.diff
@@ -0,0 +1,81 @@
+diff -r 85e7cfbbb08a sfx2/inc/sfx2/mgetempl.hxx
+--- sfx2/inc/sfx2/mgetempl.hxx	Tue Jun 29 15:31:44 2010 +0200
++++ sfx2/inc/sfx2/mgetempl.hxx	Sat Jul 24 19:55:35 2010 +0200
+@@ -37,6 +37,9 @@
+ 
+ #include <sfx2/tabdlg.hxx>
+ 
++#include <svtools/svmedit2.hxx>
++#include <svtools/svmedit.hxx>
++
+ /* erwartet:
+ 	SID_TEMPLATE_NAME   : 	In: StringItem, Name der Vorlage
+ 	SID_TEMPLATE_FAMILY :	In: Familie der Vorlage
+@@ -54,6 +57,8 @@
+ {
+ 	FixedText aNameFt;
+ 	Edit aNameEd;
++	ExtMultiLineEdit aNameMLE;
++
+ 	CheckBox	aAutoCB;
+ 
+ 	FixedText aFollowFt;
+diff -r 85e7cfbbb08a sfx2/source/dialog/mgetempl.cxx
+--- sfx2/source/dialog/mgetempl.cxx	Tue Jun 29 15:31:44 2010 +0200
++++ sfx2/source/dialog/mgetempl.cxx	Sat Jul 24 19:55:35 2010 +0200
+@@ -65,6 +65,7 @@
+ 
+ 	aNameFt		( this, SfxResId( FT_NAME ) ),
+ 	aNameEd		( this, SfxResId( ED_NAME ) ),
++	aNameMLE	( this, SfxResId( MLE_NAME ) ),
+ 	aAutoCB     ( this, SfxResId( CB_AUTO ) ),
+ 
+ 	aFollowFt	( this, SfxResId( FT_NEXT ) ),
+@@ -147,8 +148,17 @@
+ 	}
+ 	aNameEd.SetText(pStyle->GetName());
+ 
+-	if ( !pStyle->IsUserDefined() )
++	// Set the field read-only if it is NOT an user-defined style
++	// but allow selecting and copying
++	if ( !pStyle->IsUserDefined() ) {
+ 		aNameEd.SetReadOnly();
++		aNameEd.Hide();
++
++    	aNameMLE.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
++		aNameMLE.SetText( pStyle->GetName() );
++		aNameMLE.EnableCursor( FALSE );
++		aNameMLE.Show();
++	}
+ 
+ 	if ( pStyle->HasFollowSupport() && pPool )
+ 	{
+diff -r 85e7cfbbb08a sfx2/source/dialog/mgetempl.hrc
+--- sfx2/source/dialog/mgetempl.hrc	Tue Jun 29 15:31:44 2010 +0200
++++ sfx2/source/dialog/mgetempl.hrc	Sat Jul 24 19:55:35 2010 +0200
+@@ -25,6 +25,7 @@
+  *
+  ************************************************************************/
+ #define ED_NAME 2
++#define MLE_NAME 13
+ #define LB_NEXT 4
+ #define FT_BASE 5
+ #define LB_BASE 6
+diff -r 85e7cfbbb08a sfx2/source/dialog/mgetempl.src
+--- sfx2/source/dialog/mgetempl.src	Tue Jun 29 15:31:44 2010 +0200
++++ sfx2/source/dialog/mgetempl.src	Sat Jul 24 19:55:35 2010 +0200
+@@ -48,6 +48,14 @@
+ 		Pos = MAP_APPFONT ( 70 , 6  ) ;
+ 		Size = MAP_APPFONT ( 184 , 12 ) ;
+ 	};
++    MultiLineEdit MLE_NAME
++    {
++		Pos = MAP_APPFONT ( 70 , 6  ) ;
++		Size = MAP_APPFONT ( 80 , 12 ) ;
++		Border = FALSE;
++		ReadOnly = TRUE;
++		Hide = TRUE;
++    };
+ 	CheckBox CB_AUTO
+ 	{
+ 		Pos = MAP_APPFONT ( 164 , 8 ) ;