rpms/openoffice.org/devel workspace.sdfindall.patch, NONE, 1.1 openoffice.org.spec, 1.2182, 1.2183 openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18815

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.sdfindall.patch 
Removed Files:
	openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch 
Log Message:
rename patch to upstream workspace

workspace.sdfindall.patch:
 srchdlg.cxx |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE workspace.sdfindall.patch ---
Index: svx/source/dialog/srchdlg.cxx
===================================================================
--- svx/source/dialog/srchdlg.cxx	(revision 272843)
+++ svx/source/dialog/srchdlg.cxx	(working copy)
@@ -873,6 +873,18 @@
         pMoreBtn->AddWindow( &aNoFormatBtn );
     }
 
+    if (bDrawApp || bImpressApp)
+    {
+        // "Find All" button is hidden--align "Find" vertically to the
+        // search listbox
+        Point aNewPt(aSearchBtn.GetPosPixel());
+        const Size aBtnSz(aSearchBtn.GetSizePixel());
+        const Size aLBSz(aSearchLB.GetSizePixel());
+        const int nOff((aLBSz.Height() - aBtnSz.Height()) / 2);
+        aNewPt.Y() = aSearchLB.GetPosPixel().Y() + nOff;
+        aSearchBtn.SetPosPixel(aNewPt);
+    }
+
     if ( bDrawApp )
     {
         // Draw App: "Regular expressions" and "Search for Styles" check boxes are hidden
@@ -1058,6 +1070,8 @@
 
 		if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_DRAW )
 		{
+            aSearchAllBtn.Hide();
+
 			aRegExpBtn.Hide();
 			aLayoutBtn.Hide();
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2182
retrieving revision 1.2183
diff -u -p -r1.2182 -r1.2183
--- openoffice.org.spec	10 Apr 2010 13:53:01 -0000	1.2182
+++ openoffice.org.spec	13 Apr 2010 16:36:35 -0000	1.2183
@@ -97,7 +97,7 @@ Patch26: openoffice.org-3.1.0.ooo101355.
 Patch27: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
 Patch28: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
 Patch29: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch30: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch30: workspace.sdfindall.patch
 Patch31: workspace.dr73.patch
 Patch32: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 Patch33: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
@@ -1653,7 +1653,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch27 -p0 -b .ooo101567.i18npool.mailocaledata.patch
 %patch28 -p0 -b .ooo102061.sc.cellanchoring.patch
 %patch29 -p0 -b .ooo102142.sd.resleak.patch
-%patch30 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch30 -p0 -b .workspace.sdfindall.patch
 %patch31 -p0 -b .workspace.dr73.patch
 %patch32 -p0 -b .ooo104329.dbaccess.primarykeys.patch
 %patch33 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch


--- openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch DELETED ---