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

[Tor Lillqvist]

 patches/dev300/go-oo-team.diff |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

New commits:
commit b51964b5951159c1c58d00c61427299c52f9ea0b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:51:23 2011 +0300

    Make go-oo-team.diff apply again

diff --git a/patches/dev300/go-oo-team.diff b/patches/dev300/go-oo-team.diff
index af27704..b3335ec 100644
--- a/patches/dev300/go-oo-team.diff
+++ b/patches/dev300/go-oo-team.diff
@@ -1,11 +1,3 @@
----
- sw/inc/dochdl.hrc               |    4 ++-
- sw/source/ui/dochdl/dochdl.src  |    9 +++++++
- sw/source/ui/dochdl/gloshdl.cxx |   46 ++++++++++++++++++++++++++++++++++++--
- 3 files changed, 55 insertions(+), 4 deletions(-)
-
-diff --git sw/inc/dochdl.hrc sw/inc/dochdl.hrc
-index 8e5980e..9352e62 100755
 --- sw/inc/dochdl.hrc
 +++ sw/inc/dochdl.hrc
 @@ -43,8 +43,10 @@
@@ -20,8 +12,6 @@ index 8e5980e..9352e62 100755
  
  #if DOCHDL_ACT_END > RC_DOCHDL_END
  #error Resource-Id Ueberlauf in #file, #line
-diff --git sw/source/ui/dochdl/dochdl.src sw/source/ui/dochdl/dochdl.src
-index 2afd19c..94b080b 100755
 --- sw/source/ui/dochdl/dochdl.src
 +++ sw/source/ui/dochdl/dochdl.src
 @@ -74,3 +74,12 @@ String STR_DDEFORMAT
@@ -37,8 +27,6 @@ index 2afd19c..94b080b 100755
 +{
 +    TEXT = "From top left: Andreas, Bernhard, Cedric, David, Dhananjay, Donna\nEric, Federico, Fong, Fridrich, Giuseppe, Hubert\nJakub, Jan, Jan, Jiao, Jody, Kai\nKalman, Kohei, Martin, Matthias, Michael, Mike\nMiklos, Noel, Petr, Radek, Rene, Silvan\nThorsten, Tor, Volker, Wei, Yin, ZhangYun.\n";
 +};
-diff --git sw/source/ui/dochdl/gloshdl.cxx sw/source/ui/dochdl/gloshdl.cxx
-index c19fb0b..e10efd1 100755
 --- sw/source/ui/dochdl/gloshdl.cxx
 +++ sw/source/ui/dochdl/gloshdl.cxx
 @@ -607,9 +607,49 @@ BOOL SwGlossaryHdl::Expand( const String& rShortName,
@@ -93,7 +81,4 @@ index c19fb0b..e10efd1 100755
 +            }
          }
  
-         return FALSE;
--- 
-1.7.0.1
-
+         return sal_False;