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

[Tor Lillqvist]

 patches/dev300/document-password-change-sfx2.diff |   23 ++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 2a5a0b169efbe56034bd4b9f182c23f3b816c0f2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:48:32 2011 +0300

    Make document-password-change-sfx2.diff apply again

diff --git a/patches/dev300/document-password-change-sfx2.diff b/patches/dev300/document-password-change-sfx2.diff
index 77b523d..cf36a54 100644
--- a/patches/dev300/document-password-change-sfx2.diff
+++ b/patches/dev300/document-password-change-sfx2.diff
@@ -1,12 +1,3 @@
----
- sfx2/inc/sfx2/dinfdlg.hxx      |    3 ++
- sfx2/source/dialog/dinfdlg.cxx |   58 ++++++++++++++++++++++++++++++++++++++++
- sfx2/source/dialog/dinfdlg.hrc |    1 +
- sfx2/source/dialog/dinfdlg.src |   11 ++++++-
- 4 files changed, 71 insertions(+), 2 deletions(-)
-
-diff --git sfx2/inc/sfx2/dinfdlg.hxx sfx2/inc/sfx2/dinfdlg.hxx
-index 45a087b..ed1725b 100644
 --- sfx2/inc/sfx2/dinfdlg.hxx
 +++ sfx2/inc/sfx2/dinfdlg.hxx
 @@ -173,6 +173,7 @@ class SfxDocumentPage : public SfxTabPage
@@ -27,8 +18,6 @@ index 45a087b..ed1725b 100644
  
  protected:
      SfxDocumentPage( Window* pParent, const SfxItemSet& );
-diff --git sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dinfdlg.cxx
-index 409e29c..eba398b 100644
 --- sfx2/source/dialog/dinfdlg.cxx
 +++ sfx2/source/dialog/dinfdlg.cxx
 @@ -65,6 +65,7 @@
@@ -126,8 +115,6 @@ index 409e29c..eba398b 100644
  //------------------------------------------------------------------------
  
  SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet& rItemSet )
-diff --git sfx2/source/dialog/dinfdlg.hrc sfx2/source/dialog/dinfdlg.hrc
-index 774b91b..235a31f 100644
 --- sfx2/source/dialog/dinfdlg.hrc
 +++ sfx2/source/dialog/dinfdlg.hrc
 @@ -133,6 +133,7 @@
@@ -138,14 +125,12 @@ index 774b91b..235a31f 100644
  
  #define WIN_PROPERTIES      90
  #define SB_VERTICAL         91
-diff --git sfx2/source/dialog/dinfdlg.src sfx2/source/dialog/dinfdlg.src
-index c8c7d09..4d55137 100644
 --- sfx2/source/dialog/dinfdlg.src
 +++ sfx2/source/dialog/dinfdlg.src
-@@ -121,10 +121,17 @@ TabPage TP_DOCINFODOC
-     };
+@@ -121,10 +121,18 @@ TabPage TP_DOCINFODOC
      Edit ED_FILE_NAME
      {
+         HelpID = "sfx2:Edit:TP_DOCINFODOC:ED_FILE_NAME";
 -        Pos = MAP_APPFONT ( 54 , 12 ) ;
 -        Size = MAP_APPFONT ( 200 , RSC_CD_TEXTBOX_HEIGHT ) ;
 +        Pos = MAP_APPFONT ( 36 , 12 ) ;
@@ -154,6 +139,7 @@ index c8c7d09..4d55137 100644
      };
 +    PushButton BTN_CHANGE_PASS
 +    {
++        HelpID = "sfx2:Edit:TP_DOCINFODOC:BTN_CHANGE_PASS";
 +        Pos = MAP_APPFONT ( 189 , 11 ) ;
 +        Size = MAP_APPFONT ( 65 , RSC_CD_PUSHBUTTON_HEIGHT ) ;
 +        Hide = FALSE;
@@ -162,6 +148,3 @@ index c8c7d09..4d55137 100644
      FixedLine FL_FILE_1
      {
          Pos = MAP_APPFONT ( 6 , 31 ) ;
--- 
-1.7.0.1
-