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

Petr Mladek pmladek at kemper.freedesktop.org
Fri Apr 15 07:26:04 PDT 2011


 patches/dev300/pdf-export-dialog-reduce-height.diff |   60 ++++++++++++++++----
 1 file changed, 49 insertions(+), 11 deletions(-)

New commits:
commit b659f294ac7efe00b8745a5e35a64b9924347579
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 15 16:25:41 2011 +0200

    fix pdf-export-dialog-reduce-height.diff to apply

diff --git a/patches/dev300/pdf-export-dialog-reduce-height.diff b/patches/dev300/pdf-export-dialog-reduce-height.diff
index 20a6dd6..773680a 100644
--- a/patches/dev300/pdf-export-dialog-reduce-height.diff
+++ b/patches/dev300/pdf-export-dialog-reduce-height.diff
@@ -23,7 +23,7 @@
  //string for TabDialog standard buttons
  String STR_PDF_EXPORT
  {
-@@ -59,62 +59,62 @@ TabPage  RID_PDF_TAB_GENER
+@@ -59,69 +59,69 @@ TabPage  RID_PDF_TAB_GENER
  
      FixedLine FL_PAGES
      {
@@ -34,6 +34,7 @@
      };
      RadioButton RB_ALL
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL";
 -        Pos = MAP_APPFONT ( 12 , 14 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 14 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -41,6 +42,7 @@
      };
      RadioButton RB_RANGE
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE";
 -        Pos = MAP_APPFONT ( 12 , 27 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 27 ) ;
          Size = MAP_APPFONT ( 101 , 10 ) ;
@@ -48,6 +50,7 @@
      };
      Edit ED_PAGES
      {
+         HelpID = "filter:Edit:RID_PDF_TAB_GENER:ED_PAGES";
          Border = TRUE ;
 -        Pos = MAP_APPFONT ( 116, 26 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 116, 26 ) ;
@@ -55,6 +58,7 @@
      };
      RadioButton RB_SELECTION
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_SELECTION";
 -        Pos = MAP_APPFONT ( 12 , 40 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 40 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -69,6 +73,7 @@
      };
      RadioButton RB_LOSSLESSCOMPRESSION
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_LOSSLESSCOMPRESSION";
 -        Pos = MAP_APPFONT ( 12 , 64 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 64 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -76,6 +81,7 @@
      };
      RadioButton RB_JPEGCOMPRESSION
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_JPEGCOMPRESSION";
 -        Pos = MAP_APPFONT ( 12 , 76 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 76 ) ;
          Size = MAP_APPFONT ( 158, 10 ) ;
@@ -90,16 +96,18 @@
      };
      MetricField NF_QUALITY
      {
+         HelpID = "filter:MetricField:RID_PDF_TAB_GENER:NF_QUALITY";
          Border = TRUE ;
 -        Pos = MAP_APPFONT ( 116, 88 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 116, 88 ) ;
          Size = MAP_APPFONT ( 48, 12 ) ;
          TabStop = TRUE ;
          Spin = TRUE ;
-@@ -124,14 +124,14 @@ TabPage  RID_PDF_TAB_GENER
+@@ -124,16 +124,16 @@ TabPage  RID_PDF_TAB_GENER
      };
      CheckBox CB_REDUCEIMAGERESOLUTION
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_REDUCEIMAGERESOLUTION";
 -        Pos = MAP_APPFONT ( 12 , 103 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 103 ) ;
          Size = MAP_APPFONT ( 101 , 10 ) ;
@@ -108,12 +116,13 @@
      };
      ComboBox CO_REDUCEIMAGERESOLUTION
      {
+         HelpID = "filter:ComboBox:RID_PDF_TAB_GENER:CO_REDUCEIMAGERESOLUTION";
 -        Pos = MAP_APPFONT ( 116 , 102 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 116 , 102 ) ;
          Size = MAP_APPFONT ( 48 , 50 ) ;
          TabStop = TRUE ;
          DropDown = TRUE ;
-@@ -146,41 +146,41 @@ TabPage  RID_PDF_TAB_GENER
+@@ -146,45 +146,45 @@ TabPage  RID_PDF_TAB_GENER
      };
      FixedLine FL_GENERAL
      {
@@ -124,6 +133,7 @@
      };
      CheckBox CB_PDFA_1B_SELECT
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_PDFA_1B_SELECT";
 -        Pos = MAP_APPFONT ( 12, 128 ) ;
 +        Pos = MAP_APPFONT ( 12, 14 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -132,6 +142,7 @@
      };
      CheckBox CB_TAGGEDPDF
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_TAGGEDPDF";
 -        Pos = MAP_APPFONT ( 12 , 141 ) ;
 +        Pos = MAP_APPFONT ( 12 , 27 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -140,6 +151,7 @@
      };
      CheckBox CB_EXPORTFORMFIELDS
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTFORMFIELDS";
 -        Pos = MAP_APPFONT ( 12 , 154 ) ;
 +        Pos = MAP_APPFONT ( 12 , 40 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -155,16 +167,18 @@
      };
      ListBox LB_FORMSFORMAT
      {
+         HelpID = "filter:ListBox:RID_PDF_TAB_GENER:LB_FORMSFORMAT";
          Border = TRUE ;
 -        Pos = MAP_APPFONT ( 126, 166 ) ;
 +        Pos = MAP_APPFONT ( 126, 52 ) ;
          Size = MAP_APPFONT ( 38, 48 ) ;
          DeltaLang = < Default ; Default ; Default ; Default ; > ;
          TabStop = TRUE ;
-@@ -195,50 +195,50 @@ TabPage  RID_PDF_TAB_GENER
+@@ -195,57 +195,57 @@ TabPage  RID_PDF_TAB_GENER
      };
      CheckBox CB_ALLOWDUPLICATEFIELDNAMES
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_ALLOWDUPLICATEFIELDNAMES";
 -        Pos = MAP_APPFONT( 30, 178 );
 +        Pos = MAP_APPFONT( 30, 66 );
          Size = MAP_APPFONT( 128, 10 );
@@ -173,6 +187,7 @@
      };
      CheckBox CB_EXPORTBOOKMARKS
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTBOOKMARKS";
 -        Pos = MAP_APPFONT ( 12 , 190 ) ;
 +        Pos = MAP_APPFONT ( 12 , 78 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -181,6 +196,7 @@
      };
      CheckBox CB_EXPORTNOTES
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTES";
 -        Pos = MAP_APPFONT ( 12 , 203 ) ;
 +        Pos = MAP_APPFONT ( 12 , 91 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -189,14 +205,16 @@
      };
      CheckBox CB_EXPORTNOTESPAGES
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTESPAGES";
 -        Pos = MAP_APPFONT ( 12 , 216 ) ;
 +        Pos = MAP_APPFONT ( 12 , 104 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "Export ~notes pages";
      };
-     CheckBox CB_EXPORTEMPTYPAGES
+      CheckBox CB_EXPORTEMPTYPAGES
      {
+        HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES";
 -        Pos = MAP_APPFONT ( 12 , 229 ) ;
 -        Size = MAP_APPFONT ( 158 , 16 ) ;
 +        Pos = MAP_APPFONT ( 12 , 117 ) ;
@@ -207,6 +225,7 @@
      };
      CheckBox CB_EMBEDSTANDARDFONTS
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EMBEDSTANDARDFONTS";
 -        Pos = MAP_APPFONT ( 12 , 248 ) ;
 +        Pos = MAP_APPFONT ( 12 , 130 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -215,12 +234,13 @@
      };
      CheckBox CB_ADDSTREAM
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM";
 -        Pos = MAP_APPFONT ( 12 , 261 ) ;
 +        Pos = MAP_APPFONT ( 12 , 143 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "Create ~hybrid file";
-@@ -352,37 +352,37 @@ TabPage  RID_PDF_TAB_OPNFTR
+@@ -352,42 +352,42 @@ TabPage  RID_PDF_TAB_OPNFTR
  ////////////////////////////////////////
      FixedLine FL_PAGE_LAYOUT
      {
@@ -231,6 +251,7 @@
      };
      RadioButton  RB_PGLY_DEFAULT
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_DEFAULT";
 -        Pos = MAP_APPFONT ( 12 , 158 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 15 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -238,6 +259,7 @@
      };
      RadioButton  RB_PGLY_SINGPG
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_SINGPG";
 -        Pos = MAP_APPFONT ( 12 , 170 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 27 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -245,6 +267,7 @@
      };
      RadioButton  RB_PGLY_CONT
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONT";
 -        Pos = MAP_APPFONT ( 12 , 182 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 39 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -252,6 +275,7 @@
      };
      RadioButton  RB_PGLY_CONTFAC
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONTFAC";
 -        Pos = MAP_APPFONT ( 12 , 194 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 51 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -259,12 +283,13 @@
      };
      CheckBox  CB_PGLY_FIRSTLEFT
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_OPNFTR:CB_PGLY_FIRSTLEFT";
 -        Pos = MAP_APPFONT ( 22 , 206 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 22 , 63 ) ;
          Size = MAP_APPFONT ( 148 , 10 ) ;
          Text[ en-US ] = "First page is ~left" ;
      };
-@@ -465,13 +465,13 @@ TabPage  RID_PDF_TAB_VPREFER
+@@ -465,14 +465,14 @@ TabPage  RID_PDF_TAB_VPREFER
  ////////////////////////////////
      FixedLine FL_TRANSITIONS
      {
@@ -275,12 +300,13 @@
      };
      CheckBox CB_TRANSITIONEFFECTS
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_TRANSITIONEFFECTS";
 -        Pos = MAP_APPFONT ( 12 , 126 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 15 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "~Use transition effects";
-@@ -479,25 +479,25 @@ TabPage  RID_PDF_TAB_VPREFER
+@@ -479,28 +479,28 @@ TabPage  RID_PDF_TAB_VPREFER
  ////////////////////////////////
      FixedLine FL_BOOKMARKS
      {
@@ -291,6 +317,7 @@
      };
      RadioButton RB_ALLBOOKMARKLEVELS
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_VPREFER:RB_ALLBOOKMARKLEVELS";
 -        Pos = MAP_APPFONT ( 12 , 152 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 41 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -298,6 +325,7 @@
      };
      RadioButton RB_VISIBLEBOOKMARKLEVELS
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_VPREFER:RB_VISIBLEBOOKMARKLEVELS";
 -        Pos = MAP_APPFONT ( 12 , 166 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 55 ) ;
          Size = MAP_APPFONT ( 117 , 10 ) ;
@@ -305,12 +333,13 @@
      };
      NumericField NUM_BOOKMARKLEVELS
      {
+         HelpID = "filter:NumericField:RID_PDF_TAB_VPREFER:NUM_BOOKMARKLEVELS";
 -        Pos = MAP_APPFONT ( 132 , 165 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 132 , 54 ) ;
          Size = MAP_APPFONT ( 32 , 12 ) ;
          Border = TRUE;
          Spin = TRUE;
-@@ -589,25 +589,25 @@ TabPage  RID_PDF_TAB_SECURITY
+@@ -589,28 +589,28 @@ TabPage  RID_PDF_TAB_SECURITY
  //////////////////////////////
      FixedLine FL_PRINT_PERMISSIONS
      {
@@ -321,6 +350,7 @@
      };
      RadioButton RB_PRINT_NONE
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_NONE";
 -        Pos = MAP_APPFONT ( 18 , 101 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 14 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -328,6 +358,7 @@
      };
      RadioButton RB_PRINT_LOWRES
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_LOWRES";
 -        Pos = MAP_APPFONT ( 18 , 112 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 25 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -335,12 +366,13 @@
      };
      RadioButton RB_PRINT_HIGHRES
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_HIGHRES";
 -        Pos = MAP_APPFONT ( 18 , 123 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 36 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
          Text[ en-US ] = "~High resolution";
      };
-@@ -615,45 +615,45 @@ TabPage  RID_PDF_TAB_SECURITY
+@@ -615,51 +615,51 @@ TabPage  RID_PDF_TAB_SECURITY
  /////////////////////////////
      FixedLine FL_CHANGES_ALLOWED
      {
@@ -351,6 +383,7 @@
      };
      RadioButton RB_CHANGES_NONE
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_NONE";
 -        Pos = MAP_APPFONT ( 18 , 145 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 58 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -358,6 +391,7 @@
      };
      RadioButton RB_CHANGES_INSDEL
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_INSDEL";
 -        Pos = MAP_APPFONT ( 18 , 157 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 70 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -365,6 +399,7 @@
      };
      RadioButton RB_CHANGES_FILLFORM
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_FILLFORM";
 -        Pos = MAP_APPFONT ( 18 , 168 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 81 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -372,6 +407,7 @@
      };
      RadioButton RB_CHANGES_COMMENT
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_COMMENT";
 -        Pos = MAP_APPFONT ( 18 , 179 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 92 ) ;
          Size = MAP_APPFONT ( 152 , 16 ) ;
@@ -380,6 +416,7 @@
      };
      RadioButton RB_CHANGES_ANY_NOCOPY
      {
+         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_ANY_NOCOPY";
 -        Pos = MAP_APPFONT ( 18 , 198 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 12 , 111 ) ;
          Size = MAP_APPFONT ( 152 , 10 ) ;
@@ -388,15 +425,16 @@
  
      CheckBox CB_ENDAB_COPY
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENDAB_COPY";
 -        Pos = MAP_APPFONT ( 12 , 211 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 6 , 124 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "Ena~ble copying of content" ;
 @@ -661,7 +661,7 @@ TabPage  RID_PDF_TAB_SECURITY
- 
      CheckBox CB_ENAB_ACCESS
      {
+         HelpID = "filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENAB_ACCESS";
 -        Pos = MAP_APPFONT ( 12 , 224 ) ;
 +        Pos = MAP_APPFONT ( PDF_COL2 + 6 , 137 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;


More information about the Libreoffice-commits mailing list