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

[Tor Lillqvist]

 patches/dev300/sfx2-privateprotectedpublic.diff |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

New commits:
commit 8f8ab6405e6957dd2993d61abd25e85386de337e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 13:14:10 2011 +0300

    Make sfx2-privateprotectedpublic.diff apply again

diff --git a/patches/dev300/sfx2-privateprotectedpublic.diff b/patches/dev300/sfx2-privateprotectedpublic.diff
index fefb913..2bbba11 100644
--- a/patches/dev300/sfx2-privateprotectedpublic.diff
+++ b/patches/dev300/sfx2-privateprotectedpublic.diff
@@ -1,9 +1,3 @@
----
- sfx2/inc/sfx2/tabdlg.hxx |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git sfx2/inc/sfx2/tabdlg.hxx sfx2/inc/sfx2/tabdlg.hxx
-index 6f84e0c..55d0199 100644
 --- sfx2/inc/sfx2/tabdlg.hxx
 +++ sfx2/inc/sfx2/tabdlg.hxx
 @@ -92,8 +92,9 @@ friend class SfxTabPage;
@@ -26,19 +20,16 @@ index 6f84e0c..55d0199 100644
 +private:
      SfxItemSet*			pOutSet;
      TabDlg_Impl*		pImpl;
-     USHORT*				pRanges;
+     sal_uInt16*				pRanges;
 @@ -119,9 +119,10 @@
      DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
-     SAL_DLLPRIVATE void Init_Impl(BOOL, const String *);
-
+     SAL_DLLPRIVATE void Init_Impl(sal_Bool, const String *);
+ 
 -protected:
 +public:
-     virtual short                              Ok();
+     virtual short				Ok();
      // wird im Sfx gel"oscht!
 +protected:
-     virtual SfxItemSet*                        CreateInputItemSet( USHORT nId );
+     virtual SfxItemSet*			CreateInputItemSet( sal_uInt16 nId );
      // wird *nicht* im Sfx gel"oscht!
-     virtual const SfxItemSet*  GetRefreshedSet();
--- 
-1.7.0.1
-
+     virtual const SfxItemSet*	GetRefreshedSet();