[libreoffice/f15] fix up patches to apply

Caolan McNamara caolanm at fedoraproject.org
Tue Jul 5 14:31:47 UTC 2011


commit 4898153ef78d36c10117ba8bf1f391b8b06c7d01
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 5 15:31:34 2011 +0100

    fix up patches to apply

 ...z-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch |   24 +++--
 ...bz-713154-pdf-export-dialog-too-tall-to-f.patch |  114 +++++++-------------
 2 files changed, 56 insertions(+), 82 deletions(-)
---
diff --git a/0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch b/0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
index 86591c3..ec639a7 100644
--- a/0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
+++ b/0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
@@ -11,17 +11,28 @@ diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
 index 1a31cf4..336a57d 100644
 --- a/sw/source/core/text/pormulti.cxx
 +++ b/sw/source/core/text/pormulti.cxx
-@@ -947,15 +947,18 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos,
-     else
-         pRotItem = NULL;
-     const SvxTwoLinesItem* p2Lines = NULL;
+@@ -940,9 +940,13 @@
+     if ( pMulti )
+         return NULL;
+ 
 +    const SwTxtNode *pLclTxtNode = pFrm->GetTxtNode();
 +    if( !pLclTxtNode )
 +        return NULL;
++
+     const SvxCharRotateItem* pRotate = NULL;
+     const SfxPoolItem* pRotItem;
+-    if( SFX_ITEM_SET == pFrm->GetTxtNode()->GetSwAttrSet().
++    if( SFX_ITEM_SET == pLclTxtNode->GetSwAttrSet().
+         GetItemState( RES_CHRATR_ROTATE, TRUE, &pRotItem ) &&
+         ((SvxCharRotateItem*)pRotItem)->GetValue() )
+         pRotate = (SvxCharRotateItem*)pRotItem;
+@@ -950,14 +954,14 @@
+         pRotItem = NULL;
+     const SvxTwoLinesItem* p2Lines = NULL;
      const SfxPoolItem* pItem;
 -    if( SFX_ITEM_SET == pFrm->GetTxtNode()->GetSwAttrSet().
 +    if( SFX_ITEM_SET == pLclTxtNode->GetSwAttrSet().
-         GetItemState( RES_CHRATR_TWO_LINES, sal_True, &pItem ) &&
+         GetItemState( RES_CHRATR_TWO_LINES, TRUE, &pItem ) &&
          ((SvxTwoLinesItem*)pItem)->GetValue() )
          p2Lines = (SvxTwoLinesItem*)pItem;
      else
@@ -32,6 +43,3 @@ index 1a31cf4..336a57d 100644
      if( !pHints && !p2Lines && !pRotate )
          return NULL;
      const SwTxtAttr *pRuby = NULL;
--- 
-1.7.5.4
-
diff --git a/0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch b/0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
index 3b9c943..aaac632 100644
--- a/0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
+++ b/0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
@@ -15,7 +15,7 @@ diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
 index c8d5049..54ec9b3 100644
 --- a/filter/source/pdf/impdialog.cxx
 +++ b/filter/source/pdf/impdialog.cxx
-@@ -434,6 +434,8 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
+@@ -432,6 +432,8 @@
      maCbReduceImageResolution( this, PDFFilterResId( CB_REDUCEIMAGERESOLUTION ) ),
      maCoReduceImageResolution( this, PDFFilterResId( CO_REDUCEIMAGERESOLUTION ) ),
  
@@ -24,7 +24,7 @@ index c8d5049..54ec9b3 100644
      maFlGeneral( this, PDFFilterResId( FL_GENERAL ) ),
      maCbPDFA1b( this, PDFFilterResId( CB_PDFA_1B_SELECT ) ),
  
-@@ -791,6 +793,8 @@ ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage( Window* pParent,
+@@ -772,6 +774,8 @@
      maRbMagnZoom( this, PDFFilterResId( RB_MAGNF_ZOOM ) ),
      maNumZoom( this, PDFFilterResId( NUM_MAGNF_ZOOM ) ),
  
@@ -33,7 +33,7 @@ index c8d5049..54ec9b3 100644
      maFlPageLayout( this, PDFFilterResId( FL_PAGE_LAYOUT ) ),
      maRbPgLyDefault( this, PDFFilterResId( RB_PGLY_DEFAULT ) ),
      maRbPgLySinglePage( this, PDFFilterResId( RB_PGLY_SINGPG ) ),
-@@ -955,6 +959,8 @@ ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent,
+@@ -935,6 +939,8 @@
      maCbOpenFullScreen( this, PDFFilterResId( CB_WNDOPT_OPNFULL ) ),
      maCbDispDocTitle( this, PDFFilterResId( CB_DISPDOCTITLE ) ),
  
@@ -42,9 +42,9 @@ index c8d5049..54ec9b3 100644
      maFlUIOptions( this, PDFFilterResId( FL_USRIFOPT ) ),
      maCbHideViewerMenubar( this, PDFFilterResId( CB_UOP_HIDEVMENUBAR ) ),
      maCbHideViewerToolbar( this, PDFFilterResId( CB_UOP_HIDEVTOOLBAR ) ),
-@@ -1053,6 +1059,8 @@ ImpPDFTabSecurityPage::ImpPDFTabSecurityPage( Window* i_pParent,
+@@ -1028,6 +1034,8 @@
+     maOwnerPwdSet( PDFFilterResId( STR_OWNER_PWD_SET ) ),
      maOwnerPwdUnset( PDFFilterResId( STR_OWNER_PWD_UNSET ) ),
-     maOwnerPwdPdfa( PDFFilterResId( STR_OWNER_PWD_PDFA ) ),
  
 +    m_aVerticalLine(this, PDFFilterResId(FL_SECURITY_VERTICAL)),
 +
@@ -68,7 +68,7 @@ diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
 index bc2cd3e..a784973 100644
 --- a/filter/source/pdf/impdialog.hxx
 +++ b/filter/source/pdf/impdialog.hxx
-@@ -190,6 +190,8 @@ class ImpPDFTabGeneralPage : public SfxTabPage
+@@ -188,6 +188,8 @@
      CheckBox                    maCbReduceImageResolution;
      ComboBox                    maCoReduceImageResolution;
  
@@ -77,7 +77,7 @@ index bc2cd3e..a784973 100644
      FixedLine                   maFlGeneral;
      CheckBox                    maCbPDFA1b;
      CheckBox                    maCbTaggedPDF;
-@@ -254,6 +256,8 @@ class ImpPDFTabOpnFtrPage : public SfxTabPage
+@@ -252,6 +254,8 @@
      RadioButton                 maRbMagnZoom;
      MetricField                 maNumZoom;
  
@@ -86,7 +86,7 @@ index bc2cd3e..a784973 100644
      FixedLine			        maFlPageLayout;
      RadioButton                 maRbPgLyDefault;
      RadioButton                 maRbPgLySinglePage;
-@@ -287,6 +291,8 @@ class ImpPDFTabViewerPage : public SfxTabPage
+@@ -285,6 +289,8 @@
      CheckBox                    maCbOpenFullScreen;
      CheckBox                    maCbDispDocTitle;
  
@@ -95,9 +95,9 @@ index bc2cd3e..a784973 100644
      FixedLine                   maFlUIOptions;
      CheckBox                    maCbHideViewerMenubar;
      CheckBox                    maCbHideViewerToolbar;
-@@ -330,6 +336,8 @@ class ImpPDFTabSecurityPage : public SfxTabPage
+@@ -325,6 +331,8 @@
+     String                      maOwnerPwdSet;
      String                      maOwnerPwdUnset;
-     String                      maOwnerPwdPdfa;
  
 +    FixedLine m_aVerticalLine;
 +
@@ -117,18 +117,16 @@ index 531d728..1779b5f 100644
  //string for TabDialog standard buttons
  String STR_PDF_EXPORT
  {
-@@ -153,16 +153,24 @@
+@@ -144,43 +144,49 @@
              "1200 DPI" ;
          };
      };
-+
 +    FixedLine FL_GENERAL_VERTICAL
 +    {
 +        Pos = MAP_APPFONT ( 175 , 3 ) ;
 +        Size = MAP_APPFONT ( 4 , 150 ) ;
 +        Vert = TRUE;
 +    };
-+
      FixedLine FL_GENERAL
      {
 -        Pos = MAP_APPFONT ( 6 , 117 ) ;
@@ -138,25 +136,22 @@ index 531d728..1779b5f 100644
      };
      CheckBox CB_PDFA_1B_SELECT
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_PDFA_1B_SELECT";
 -        Pos = MAP_APPFONT ( 12, 128 ) ;
 +        Pos = MAP_APPFONT ( 188, 14 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "P~DF/A-1a";
-@@ -170,7 +178,7 @@
+     };
      CheckBox CB_TAGGEDPDF
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_TAGGEDPDF";
 -        Pos = MAP_APPFONT ( 12 , 141 ) ;
 +        Pos = MAP_APPFONT ( 188 , 27 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "~Tagged PDF";
-@@ -178,14 +186,14 @@
+     };
      CheckBox CB_EXPORTFORMFIELDS
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTFORMFIELDS";
 -        Pos = MAP_APPFONT ( 12 , 154 ) ;
 +        Pos = MAP_APPFONT ( 188 , 40 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -170,91 +165,83 @@ index 531d728..1779b5f 100644
          Size = MAP_APPFONT ( 93, 8 ) ;
          Text[ en-US ] = "Submit ~format";
      };
-@@ -193,7 +201,7 @@
+     ListBox LB_FORMSFORMAT
      {
-         HelpID = "filter:ListBox:RID_PDF_TAB_GENER:LB_FORMSFORMAT";
          Border = TRUE ;
 -        Pos = MAP_APPFONT ( 126, 166 ) ;
 +        Pos = MAP_APPFONT ( 302, 52 ) ;
          Size = MAP_APPFONT ( 38, 48 ) ;
          DeltaLang = < Default ; Default ; Default ; Default ; > ;
          TabStop = TRUE ;
-@@ -209,7 +217,7 @@
+@@ -195,35 +201,35 @@
+     };
      CheckBox CB_ALLOWDUPLICATEFIELDNAMES
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_ALLOWDUPLICATEFIELDNAMES";
 -        Pos = MAP_APPFONT( 30, 178 );
 +        Pos = MAP_APPFONT( 206, 64 );
          Size = MAP_APPFONT( 128, 10 );
          TabStop = TRUE;
          Text [ en-US ] = "Allow duplicate field ~names";
-@@ -217,7 +225,7 @@
+     };
      CheckBox CB_EXPORTBOOKMARKS
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTBOOKMARKS";
 -        Pos = MAP_APPFONT ( 12 , 190 ) ;
 +        Pos = MAP_APPFONT ( 188 , 76 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "Export ~bookmarks";
-@@ -225,7 +233,7 @@
+     };
      CheckBox CB_EXPORTNOTES
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTES";
 -        Pos = MAP_APPFONT ( 12 , 203 ) ;
 +        Pos = MAP_APPFONT ( 188 , 89 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "~Export comments";
-@@ -233,7 +241,7 @@
+     };
      CheckBox CB_EXPORTNOTESPAGES
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTESPAGES";
 -        Pos = MAP_APPFONT ( 12 , 216 ) ;
 +        Pos = MAP_APPFONT ( 188 , 102 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "Export ~notes pages";
-@@ -241,7 +249,7 @@
+     };
      CheckBox CB_EXPORTEMPTYPAGES
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES";
 -        Pos = MAP_APPFONT ( 12 , 229 ) ;
 +        Pos = MAP_APPFONT ( 188 , 115 ) ;
          Size = MAP_APPFONT ( 158 , 16 ) ;
          TabStop = TRUE ;
          WordBreak = TRUE ;
-@@ -250,7 +258,7 @@
+@@ -231,14 +237,14 @@
+     };
      CheckBox CB_EMBEDSTANDARDFONTS
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EMBEDSTANDARDFONTS";
 -        Pos = MAP_APPFONT ( 12 , 248 ) ;
 +        Pos = MAP_APPFONT ( 188 , 134 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "E~mbed standard fonts";
-@@ -258,7 +266,7 @@
+     };
      CheckBox CB_ADDSTREAM
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM";
 -        Pos = MAP_APPFONT ( 12 , 261 ) ;
 +        Pos = MAP_APPFONT ( 188 , 147 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "Create ~hybrid file";
-@@ -385,45 +393,52 @@
+@@ -349,40 +355,45 @@
          Minimum = 50;
          Maximum = 1600;
      };
 -////////////////////////////////////////
-+
 +    FixedLine FL_INITVIEW_VERTICAL
 +    {
 +        Pos = MAP_APPFONT ( 175 , 3 ) ;
 +        Size = MAP_APPFONT ( 4 , 150 ) ;
 +        Vert = TRUE;
 +    };
-+
      FixedLine FL_PAGE_LAYOUT
      {
 -        Pos = MAP_APPFONT ( 6 , 146 ) ;
@@ -265,7 +252,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton  RB_PGLY_DEFAULT
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_DEFAULT";
 -        Pos = MAP_APPFONT ( 12 , 158 ) ;
 +        Pos = MAP_APPFONT ( 188 , 15 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -273,7 +259,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton  RB_PGLY_SINGPG
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_SINGPG";
 -        Pos = MAP_APPFONT ( 12 , 170 ) ;
 +        Pos = MAP_APPFONT ( 188 , 27 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -281,7 +266,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton  RB_PGLY_CONT
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONT";
 -        Pos = MAP_APPFONT ( 12 , 182 ) ;
 +        Pos = MAP_APPFONT ( 188 , 39 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -289,7 +273,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton  RB_PGLY_CONTFAC
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONTFAC";
 -        Pos = MAP_APPFONT ( 12 , 194 ) ;
 +        Pos = MAP_APPFONT ( 188 , 51 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -297,16 +280,16 @@ index 531d728..1779b5f 100644
      };
      CheckBox  CB_PGLY_FIRSTLEFT
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_OPNFTR:CB_PGLY_FIRSTLEFT";
 -        Pos = MAP_APPFONT ( 22 , 206 ) ;
 +        Pos = MAP_APPFONT ( 198 , 63 ) ;
          Size = MAP_APPFONT ( 148 , 10 ) ;
          Text[ en-US ] = "First page is ~left" ;
      };
-@@ -478,17 +493,23 @@
+@@ -432,31 +443,35 @@
+         TabStop = TRUE ;
          Text[ en-US ] = "~Display document title";
      };
- 
+-
 -////////////////////////////////
 +    FixedLine FL_VPREFER_VERTICAL
 +    {
@@ -314,7 +297,6 @@ index 531d728..1779b5f 100644
 +        Size = MAP_APPFONT ( 4 , 150 ) ;
 +        Vert = TRUE;
 +    };
-+
      FixedLine FL_USRIFOPT
      {
 -        Pos = MAP_APPFONT ( 6 , 64 ) ;
@@ -324,31 +306,28 @@ index 531d728..1779b5f 100644
      };
      CheckBox CB_UOP_HIDEVMENUBAR
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVMENUBAR";
 -        Pos = MAP_APPFONT ( 12 , 76 ) ;
 +        Pos = MAP_APPFONT ( 188 , 15 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "Hide ~menubar";
-@@ -496,7 +517,7 @@
+     };
      CheckBox CB_UOP_HIDEVTOOLBAR
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR";
 -        Pos = MAP_APPFONT ( 12 , 88 ) ;
 +        Pos = MAP_APPFONT ( 188 , 27 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "Hide ~toolbar";
-@@ -504,7 +525,7 @@
+     };
      CheckBox CB_UOP_HIDEVWINCTRL
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL";
 -        Pos = MAP_APPFONT ( 12 , 100 ) ;
 +        Pos = MAP_APPFONT ( 188 , 39 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "Hide ~window controls";
-@@ -513,14 +534,14 @@
+@@ -465,13 +480,13 @@
  ////////////////////////////////
      FixedLine FL_TRANSITIONS
      {
@@ -359,13 +338,12 @@ index 531d728..1779b5f 100644
      };
      CheckBox CB_TRANSITIONEFFECTS
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_TRANSITIONEFFECTS";
 -        Pos = MAP_APPFONT ( 12 , 126 ) ;
 +        Pos = MAP_APPFONT ( 12 , 76 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "~Use transition effects";
-@@ -528,28 +549,28 @@
+@@ -479,25 +494,25 @@
  ////////////////////////////////
      FixedLine FL_BOOKMARKS
      {
@@ -376,7 +354,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton RB_ALLBOOKMARKLEVELS
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_VPREFER:RB_ALLBOOKMARKLEVELS";
 -        Pos = MAP_APPFONT ( 12 , 152 ) ;
 +        Pos = MAP_APPFONT ( 188 , 76 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
@@ -384,7 +361,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton RB_VISIBLEBOOKMARKLEVELS
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_VPREFER:RB_VISIBLEBOOKMARKLEVELS";
 -        Pos = MAP_APPFONT ( 12 , 166 ) ;
 +        Pos = MAP_APPFONT ( 188 , 90 ) ;
          Size = MAP_APPFONT ( 117 , 10 ) ;
@@ -392,16 +368,16 @@ index 531d728..1779b5f 100644
      };
      NumericField NUM_BOOKMARKLEVELS
      {
-         HelpID = "filter:NumericField:RID_PDF_TAB_VPREFER:NUM_BOOKMARKLEVELS";
 -        Pos = MAP_APPFONT ( 132 , 165 ) ;
 +        Pos = MAP_APPFONT ( 308 , 89 ) ;
          Size = MAP_APPFONT ( 32 , 12 ) ;
          Border = TRUE;
          Spin = TRUE;
-@@ -649,31 +670,37 @@
-         Text [en-US] = "PDF doument will not be restricted due to PDF/A export.";
+@@ -585,29 +600,33 @@
+     {
+         Text [ en-US ] = "PDF document will be unrestricted";
      };
- 
+-
 -//////////////////////////////
 +    FixedLine FL_SECURITY_VERTICAL
 +    {
@@ -409,7 +385,6 @@ index 531d728..1779b5f 100644
 +        Size = MAP_APPFONT ( 4 , 150 ) ;
 +        Vert = TRUE;
 +    };
-+
      FixedLine FL_PRINT_PERMISSIONS
      {
 -        Pos = MAP_APPFONT ( 12 , 90 ) ;
@@ -419,7 +394,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton RB_PRINT_NONE
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_NONE";
 -        Pos = MAP_APPFONT ( 18 , 101 ) ;
 +        Pos = MAP_APPFONT ( 188 , 16 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -427,7 +401,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton RB_PRINT_LOWRES
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_LOWRES";
 -        Pos = MAP_APPFONT ( 18 , 112 ) ;
 +        Pos = MAP_APPFONT ( 188 , 27 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -435,13 +408,12 @@ index 531d728..1779b5f 100644
      };
      RadioButton RB_PRINT_HIGHRES
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_HIGHRES";
 -        Pos = MAP_APPFONT ( 18 , 123 ) ;
 +        Pos = MAP_APPFONT ( 188 , 38 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
          Text[ en-US ] = "~High resolution";
      };
-@@ -681,35 +708,35 @@
+@@ -615,45 +634,45 @@
  /////////////////////////////
      FixedLine FL_CHANGES_ALLOWED
      {
@@ -452,7 +424,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton RB_CHANGES_NONE
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_NONE";
 -        Pos = MAP_APPFONT ( 18 , 145 ) ;
 +        Pos = MAP_APPFONT ( 188 , 60 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -460,7 +431,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton RB_CHANGES_INSDEL
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_INSDEL";
 -        Pos = MAP_APPFONT ( 18 , 157 ) ;
 +        Pos = MAP_APPFONT ( 188 , 72 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -468,7 +438,6 @@ index 531d728..1779b5f 100644
      };
      RadioButton RB_CHANGES_FILLFORM
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_FILLFORM";
 -        Pos = MAP_APPFONT ( 18 , 168 ) ;
 +        Pos = MAP_APPFONT ( 188 , 83 ) ;
          Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -476,34 +445,31 @@ index 531d728..1779b5f 100644
      };
      RadioButton RB_CHANGES_COMMENT
      {
-         HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_COMMENT";
 -        Pos = MAP_APPFONT ( 18 , 179 ) ;
 +        Pos = MAP_APPFONT ( 188 , 94 ) ;
          Size = MAP_APPFONT ( 152 , 16 ) ;
          WordBreak = TRUE ;
          Text[ en-US ] = "~Commenting, filling in form fields";
-@@ -717,7 +744,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 ( 188 , 113 ) ;
          Size = MAP_APPFONT ( 152 , 10 ) ;
          Text[ en-US ] = "~Any except extracting pages";
      };
-@@ -725,7 +752,7 @@
+ 
      CheckBox CB_ENDAB_COPY
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENDAB_COPY";
 -        Pos = MAP_APPFONT ( 12 , 211 ) ;
 +        Pos = MAP_APPFONT ( 182 , 126 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;
          TabStop = TRUE ;
          Text[ en-US ] = "Ena~ble copying of content" ;
-@@ -734,7 +761,7 @@
+@@ -661,7 +680,7 @@
+ 
      CheckBox CB_ENAB_ACCESS
      {
-         HelpID = "filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENAB_ACCESS";
 -        Pos = MAP_APPFONT ( 12 , 224 ) ;
 +        Pos = MAP_APPFONT ( 182 , 139 ) ;
          Size = MAP_APPFONT ( 158 , 10 ) ;


More information about the scm-commits mailing list