[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - patches/dev300

[Tor Lillqvist]

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

New commits:
commit 49be65e3dd04a9ed88ec3eb12d7d8451ac77112a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 7 14:39:23 2011 +0300

    sfx2-style-edit-greyentry.diff seems to be in

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1aa19bd..df500c3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1710,9 +1710,6 @@ build-sled10-ixion-with-internal-boost.diff
 svx-ppt-bullet-offset-fix.diff, n#593609, rodo
 
 [ Fixes ]
-sfx2-style-edit-greyentry.diff, i#85003, simonaw
-
-[ Fixes ]
 # soffice process doesn't block ( under linux ) connect
 # to raised office instance instead ( should work for windows too )
 smoketest-officeconnection-fix.diff
commit 3d17047ce4bf6d04f2393b61a114df65ed75eed0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 7 14:38:51 2011 +0300

    Move svx-fix-layout-build.diff to UnUsedAndObsoleteLayoutDialogs

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 71e65a8..1aa19bd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1207,6 +1207,8 @@ layout-disabled-layout-build-fix.diff, pmladek
 # commented out.
 # layout-generate-localize-sdf-2.diff, bnc#595823, pmladek
 
+svx-fix-layout-build.diff, rodo
+
 
 [ OxygenOfficePalettes ]
 palette-enhanced-arrow.diff
@@ -1708,7 +1710,6 @@ build-sled10-ixion-with-internal-boost.diff
 svx-ppt-bullet-offset-fix.diff, n#593609, rodo
 
 [ Fixes ]
-svx-fix-layout-build.diff, rodo
 sfx2-style-edit-greyentry.diff, i#85003, simonaw
 
 [ Fixes ]
diff --git a/patches/dev300/sfx2-style-edit-greyentry.diff b/patches/dev300/sfx2-style-edit-greyentry.diff
deleted file mode 100644
index a86d893..0000000
--- a/patches/dev300/sfx2-style-edit-greyentry.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-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 ) ;