[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/writer-navigation-buttons.diff |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit ae382358092f29bc9120c587c97a23c9d9d4e61d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 15 11:40:15 2010 +0300

    Make writer-navigation-buttons.diff apply again
    
    Remove a pointless cosmetic diff hunk.

diff --git a/patches/dev300/writer-navigation-buttons.diff b/patches/dev300/writer-navigation-buttons.diff
index 9ecea3b..aeaee22 100644
--- a/patches/dev300/writer-navigation-buttons.diff
+++ b/patches/dev300/writer-navigation-buttons.diff
@@ -193,12 +193,14 @@ diff --git sw/inc/shellid.hxx sw/inc/shellid.hxx
 index 65af848..e3ef3e6 100644
 --- sw/inc/shellid.hxx
 +++ sw/inc/shellid.hxx
-@@ -70,4 +70,5 @@
+@@ -70,6 +70,7 @@
  #define SW_MEDIASHELL 			(SFX_INTERFACE_SW_START + 31)
  #define SW_ANNOTATIONSHELL 		(SFX_INTERFACE_SW_START + 32)
  
 +#define SW_NAVIGATIONSHELL              (SFX_INTERFACE_SW_START + 33)
  #endif // _UIPARAM_HXX
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git sw/sdi/_navsh.sdi sw/sdi/_navsh.sdi
 new file mode 100644
 index 0000000..deb4fb9
@@ -1099,13 +1101,6 @@ index 3e649a9..80dafb6 100644
  }
 
 
-@@ -686,6 +813,3 @@ BOOL SwWrtShell::SelectTxtAttr( USHORT nWhich, const SwTxtAttr* pAttr )
-     EndSelect();
-     return bRet;
- }
--
--
--
 diff --git sw/source/ui/wrtsh/navmgr.cxx sw/source/ui/wrtsh/navmgr.cxx
 new file mode 100644
 index 0000000..a0fc70f