GNOME.org
 

ooo-build r15066 - in trunk: . patches/dev300

Author: jannieuw
Date: Tue Jan 13 15:38:50 2009
New Revision: 15066
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15066&view=rev

Log:
2009-01-13  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-disable-experimental.diff:
	* patches/dev300/layoutdialogs2-development.diff: Remove whitespace
	fixes / adapt for whitespace fixes now also in upstream.
	
	* patches/dev300/apply (LayoutDialogs): Re-enable them.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/layout-disable-experimental.diff
   trunk/patches/dev300/layoutdialogs2-development.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 13 15:38:50 2009
@@ -2339,8 +2339,8 @@
 toolkit-layout-gcc-4.3.2-hack.diff, pmladek
 
 # These merge with the layoutdialogs2 cws
-#layout-disable-experimental.diff
-#layoutdialogs2-development.diff
+layout-disable-experimental.diff
+layoutdialogs2-development.diff
 
 [ AutoCorrectCapsLock ]
 SectionOwner => kohei

Modified: trunk/patches/dev300/layout-disable-experimental.diff
==============================================================================
--- trunk/patches/dev300/layout-disable-experimental.diff	(original)
+++ trunk/patches/dev300/layout-disable-experimental.diff	Tue Jan 13 15:38:50 2009
@@ -68,12 +68,13 @@
  ScTabPageSortOptions::ScTabPageSortOptions( Window* 			pParent,
  											const SfxItemSet&	rArgSet )
  
-@@ -571,10 +574,10 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* 			pParent,
+@@ -571,11 +574,10 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* 			pParent,
  // 		aFtAreaLabel	( this, ScResId( FT_AREA_LABEL ) ),
  //		aFtArea 		( this, ScResId( FT_AREA ) ),
  		//
 -#if ENABLE_LAYOUT
 +#if ENABLE_LAYOUT_EXPERIMENTAL
+-#undef this
  #undef ScResId
  #define ScResId(x) this, #x
 -#endif /* ENABLE_LAYOUT */
@@ -81,14 +82,14 @@
  		aStrRowLabel	( ScResId( STR_ROW_LABEL ) ),
  		aStrColLabel	( ScResId( STR_COL_LABEL ) ),
  		aStrUndefined	( ScResId( SCSTR_UNDEFINED ) ),
-@@ -715,10 +718,10 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
+@@ -715,9 +718,10 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
  
  // -----------------------------------------------------------------------
  
 -#if ENABLE_LAYOUT
 +#if ENABLE_LAYOUT_EXPERIMENTAL
  #undef SfxTabPage
- #define SfxTabPage TabPage
++#define SfxTabPage TabPage
 -#endif /* ENABLE_LAYOUT */
 +#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
  SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
@@ -117,7 +118,7 @@
  class CollatorWrapper;
  
 +#if ENABLE_LAYOUT_EXPERIMENTAL
- #include <layout/layout.hxx>
+ #include <sfx2/layout.hxx>
  #include <layout/layout-pre.hxx>
 +#else /* !ENABLE_LAYOUT_EXPERIMENTAL */
 +#define LocalizedString String

Modified: trunk/patches/dev300/layoutdialogs2-development.diff
==============================================================================
--- trunk/patches/dev300/layoutdialogs2-development.diff	(original)
+++ trunk/patches/dev300/layoutdialogs2-development.diff	Tue Jan 13 15:38:50 2009
@@ -1,28 +1,29 @@
-990a724... Wordcount: minor HIG tweaks.
-bdd96ae... Zoom: minor HIG spacing tweaks.
-5bf3455... Zoom: fix align-test and update zoom.xml.
-5621671... Zoom: add align-test.xml to illustrate zoom alignment bug.
-9f8efae... Find-and-Replace: request font-style-name="Bold", does not seem to work.
-775a44c... Find-and-Replace: Add alignment for combobox labels.
-74e6a94... Find-and-Replace: Replace pairs of <flow> with <align>.  Fixes ugly non-emptiness of more-<hbox>.
-401e048... Find-and-Replace: add nice 12pt border.
-0aae134... Find-and-Replace: also add rowsep at lower fixedline.
-499c964... Find-and-Replace: Add poor man's colsep and rowsep substitute spaces.
-441a6f6... Find-and-Replace: use <vbox cnt:x-expand="false"> for buttons.
-e4c0ec1... Find-and-Replace: add <vbox>s and use cnt:expand="false" to stop vertical button expansion.
-fba02b0... Find-and-Replace: use sc icon.  Fixes FIND button height.
-b6fd760... Bugfix have empty/invisible containers not take up space.
-69ff9af... Find-and-replace: Fix/remove most property errors.
-3044b08... Table: make x, y expand default.
-dd5cb2d... Use OSL_TRACE rather than printf. Fixes warning visibility.
-156a26b... Boxtest: add <vbox><table x-expand="true"> pair to trigger property errors.
-d576870... Junk extra <table> from boxtest.  Fixes visual output.
-abd572f... Eradicate PROPHELPER_SET_INFO: junk static caching.
-c2bf12f... Update awk+sed localize generation rules.  Fixes multiple (wrong) titles in Find & Replace.
-4c7b870... Use dash (-) instead of underscore (_) to separate language modifiers.  Fixes en_GB etc.
-d4247ce... Add "defbutton=true" to dialogs.  Fixes ENTER doing default action: n#439222.
-55e9b2c... Michael's new table-based find and replace.
-b5ce699... Apply Michael's boxtest patch.
+b7cd118... config_office/configure: Regenerate.  Fixes naive builds.
+d130ba7... Wordcount: minor HIG tweaks.
+01a6fce... Zoom: minor HIG spacing tweaks.
+67f2b82... Zoom: fix align-test and update zoom.xml.
+fa8d7ec... Zoom: add align-test.xml to illustrate zoom alignment bug.
+6c70e47... Find-and-Replace: request font-style-name="Bold", does not seem to work.
+afacef2... Find-and-Replace: Add alignment for combobox labels.
+27de12f... Find-and-Replace: Replace pairs of <flow> with <align>. Fixes ugly non-emptiness of more-<hbox>.
+5e1f71e... Find-and-Replace: add nice 12pt border.
+ba667ea... Find-and-Replace: also add rowsep at lower fixedline.
+150333c... Find-and-Replace: Add poor man's colsep and rowsep substitute spaces.
+fe770b8... Find-and-Replace: use <vbox cnt:x-expand="false"> for buttons.
+ab48d2a... Find-and-Replace: add <vbox>s and use cnt:expand="false" to stop vertical button expansion.
+099e60d... Find-and-Replace: use sc icon. Fixes FIND button height.
+a35e707... Bugfix have empty/invisible containers not take up space.
+5520d73... Find-and-replace: Fix/remove most property errors.
+ae26364... Table: make x, y expand default.
+4269438... Use OSL_TRACE rather than printf. Fixes warning visibility.
+3f9b304... Boxtest: add <vbox><table x-expand="true"> pair to trigger property errors.
+bc138f1... Junk extra <table> from boxtest. Fixes visual output.
+0cf4adf... Eradicate PROPHELPER_SET_INFO: junk static caching.
+f10be27... Update awk+sed localize generation rules. Fixes multiple (wrong) titles in Find & Replace.
+5f02d6f... Use dash (-) instead of underscore (_) to separate language modifiers. Fixes en_GB etc.
+e765573... Add "defbutton=true" to dialogs. Fixes ENTER doing default action: n#439222.
+284c473... Michael's new table-based find and replace.
+1c1f4cc... Apply Michael's boxtest patch.
 
 
 diff --git sc/uiconfig/layout/insert-sheet.xml sc/uiconfig/layout/insert-sheet.xml
@@ -315,10 +316,10 @@
 +    </hbox>
  </sfxmodelessdialog>
 diff --git svx/uiconfig/layout/makefile.mk svx/uiconfig/layout/makefile.mk
-index d7c3ed9..8671740 100644
+index 871db2f..26679e2 100644
 --- svx/uiconfig/layout/makefile.mk
 +++ svx/uiconfig/layout/makefile.mk
-@@ -53,7 +53,7 @@ all .PHONY:
+@@ -54,7 +54,7 @@ all .PHONY:
  .INCLUDE :  target.mk
  
  localize.sdf: $(PRJ)/source/dialog/localize.sdf
@@ -397,7 +398,7 @@
      </vbox>
  </modaldialog>
 diff --git sw/uiconfig/layout/makefile.mk sw/uiconfig/layout/makefile.mk
-index 7ca393c..c654305 100644
+index 5f4bc52..8debaa6 100644
 --- sw/uiconfig/layout/makefile.mk
 +++ sw/uiconfig/layout/makefile.mk
 @@ -50,6 +50,7 @@ all .PHONY:
@@ -585,15 +586,6 @@
 index 5cac33d..71fba80 100644
 --- toolkit/source/layout/core/container.hxx
 +++ toolkit/source/layout/core/container.hxx
-@@ -44,7 +44,7 @@
- typedef ::cppu::WeakImplHelper2< css::awt::XLayoutContainer,
-                                  css::awt::XLayoutConstrains > Container_Base;
- 
--class Container : public Container_Base, public PropHelper, public PropHelper::Listener
-+class TOOLKIT_DLLPUBLIC Container : public Container_Base, public PropHelper, public PropHelper::Listener
- {
-     friend class ChildProps;
- protected:
 @@ -73,6 +73,8 @@ public:
      Container();
      virtual ~Container() {}
@@ -673,7 +665,7 @@
      // shared between getMinimumSize() and getHeightForWidth()
      css::awt::Size calculateSize( long nMaxWidth );
 diff --git toolkit/source/layout/core/helper.cxx toolkit/source/layout/core/helper.cxx
-index 7516454..d29b951 100644
+index ec4f80f..ff13269 100644
 --- toolkit/source/layout/core/helper.cxx
 +++ toolkit/source/layout/core/helper.cxx
 @@ -42,13 +42,12 @@
@@ -927,9 +919,7 @@
  	    <cancelbutton id="BTN_CANCEL" show="false"/>
  	    <helpbutton id="BTN_HELP" show="false"/>
 diff --git toolkit/workben/layout/TEST toolkit/workben/layout/TEST
-old mode 100644
-new mode 100755
-index d6a20cb..8a04a66
+index d6a20cb..8a04a66 100755
 --- toolkit/workben/layout/TEST
 +++ toolkit/workben/layout/TEST
 @@ -1,3 +1,11 @@
@@ -1004,7 +994,7 @@
  	</vbox>
  </dialog>
 diff --git toolkit/workben/layout/editor.cxx toolkit/workben/layout/editor.cxx
-index b5e5d76..3fbc889 100644
+index f3ad65c..e10e54e 100644
 --- toolkit/workben/layout/editor.cxx
 +++ toolkit/workben/layout/editor.cxx
 @@ -344,9 +344,14 @@ public:
@@ -1244,30 +1234,64 @@
          <cancelbutton height="14" id="BTN_ZOOM_CANCEL" width="50" x="104" y="23"/>
          <radiobutton height="10" id="BTN_PAGE_WIDTH" width="80" x="12" y="27"/>
 diff --git toolkit/workben/layout/zoom.xml toolkit/workben/layout/zoom.xml
-index 5938643..c443fe6 100644
+index e228ace..4b4270f 100644
 --- toolkit/workben/layout/zoom.xml
 +++ toolkit/workben/layout/zoom.xml
-@@ -11,7 +11,7 @@
-     <vbox spacing="5" border="5">
+@@ -8,10 +8,10 @@
+              id="RID_SVXDLG_ZOOM" _title="Zoom &amp; View Layout" optimumsize="true"
+ 	     help-id="SID_ATTR_ZOOM"
+              has_border="true" sizeable="true" moveable="true" closeable="true">
+-    <vbox spacing="5" border="5">
++    <vbox spacing="0" border="12">
  	<hbox spacing="0" border="0">
- 	    <vbox spacing="5" border="5">
+-	    <vbox spacing="5" border="5">
 -		<fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="true"/>
++	    <vbox spacing="6" border="0">
 +		<fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="false"/>
  		<radiobutton radiogroup="zoom-factor" id="BTN_OPTIMAL"   _label="Optimal"/>
  		<radiobutton radiogroup="zoom-factor" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
  		<radiobutton radiogroup="zoom-factor" id="BTN_PAGE_WIDTH" _label="Page Width"/>
-@@ -29,7 +29,7 @@
+@@ -20,7 +20,7 @@
+ 		    <align cnt:expand="false" cnt:fill="true">
+ 			<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-factor" id="BTN_USER" _label="Variable"/>
+ 		    </align>
+-		    <flow cnt:padding="10" cnt:expand="false"/>
++		    <flow cnt:padding="12" cnt:expand="false"/>
+ 		    <metricfield id="ED_USER" value-step="1"
+ 				 repeat="true" has_border="true" spin="true"
+ 				 _text="100%" unit="11" custom-unit-text="%"
+@@ -28,15 +28,16 @@
+ 				 cnt:expand="false"/>
  		</hbox>
  	    </vbox>
- 	    <vbox spacing="5" border="5">
+-	    <vbox spacing="5" border="5">
 -		<fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="true"/>
++	    <flow/>
++	    <vbox spacing="6" border="0">
 +		<fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="false"/>
  		<radiobutton radiogroup="zoom-layout" id="BTN_AUTOMATIC" _label="~Automatic"/>
  		<radiobutton radiogroup="zoom-layout" id="BTN_SINGLE"    _label="~Single page"/>
  		<hbox cnt:expand="false" cnt:fill="true">
-@@ -51,9 +51,9 @@
-         <fixedline cnt:padding="1" id="FL_BOTTOM"/>
- 	<dialogbuttonhbox border="5" spacing="5">
+ 		    <align cnt:expand="false" cnt:fill="true">
+ 			<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-layout" id="BTN_COLUMNS" _label="~Columns"/>
+ 		    </align>
+-		    <flow cnt:padding="10" cnt:expand="false"/>
++		    <flow cnt:padding="12" cnt:expand="false"/>
+ 		    <metricfield id="ED_COLUMNS" value-step="1"
+ 				 repeat="true" has_border="true" spin="true"
+ 				 _text="100%"
+@@ -45,15 +46,15 @@
+ 				 spin-value="1"
+ 				 cnt:expand="false"/>
+ 		</hbox>
+-		<hbox><flow cnt:expand="false" cnt:padding="10"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
++		<hbox><flow cnt:expand="false" cnt:padding="12"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
+ 	    </vbox>
+ 	</hbox>
+-	<fixedline cnt:padding="1" id="FL_BOTTOM"/>
+-	<dialogbuttonhbox border="5" spacing="5">
++        <fixedline cnt:padding="6" id="FL_BOTTOM"/>
++	<dialogbuttonhbox border="0" spacing="12">
  	    <flow/>
 -	    <okbutton     id="BTN_ZOOM_OK"/>
 +	    <okbutton defbutton="true" id="BTN_ZOOM_OK"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]