[Libreoffice-commits] .: 2 commits - sw/source

Takeshi Abe tabe at kemper.freedesktop.org
Tue Mar 15 23:32:09 PDT 2011


 sw/source/core/bastyp/tabcol.cxx |    1 +
 sw/source/core/text/portxt.cxx   |    4 ----
 sw/source/core/text/txthyph.cxx  |    4 ----
 sw/source/core/text/txtio.cxx    |   10 ----------
 4 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit bdab38c033a986e3a342dfda503766c248101c5c
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed Mar 16 15:31:12 2011 +0900

    Removed unused function GetLangName()

diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index cfcaeb0..3fefec0 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -51,10 +51,6 @@
 #include <doc.hxx>
 #include <xmloff/odffields.hxx>
 
-#if OSL_DEBUG_LEVEL > 1
-const sal_Char *GetLangName( const MSHORT nLang );
-#endif
-
 using namespace ::sw::mark;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::i18n::ScriptType;
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index e6b8940..fb4bce8 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -43,10 +43,6 @@
 #include <guess.hxx>	//
 #include <splargs.hxx>	// SwInterHyphInfo
 
-#if OSL_DEBUG_LEVEL > 1
-extern const sal_Char *GetLangName( const MSHORT nLang );
-#endif
-
 using ::rtl::OUString;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 0e62012..0681091 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -157,11 +157,6 @@ void SwLineLayout::DebugPortions( SvStream &, const XubString &, //$ ostream
 {
 }
 
-const char *GetLangName( const MSHORT  )
-{
-    return 0;
-}
-
 #else
 #include <limits.h>
 #include <stdlib.h>
@@ -296,11 +291,6 @@ void SwLineLayout::DebugPortions( SvStream &rOs, const XubString &/*rTxt*/, //$
     }
 }
 
-const char *GetLangName( const MSHORT /*nLang*/ )
-{
-    return "???";
-}
-
 SvStream &SwLinePortion::operator<<( SvStream &rOs ) const //$ ostream
 {
     rOs << " {";
commit 7e9d9672aef9d8c6fb49171b947f02e059e4b336
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed Mar 16 15:30:06 2011 +0900

    Include <osl/diagnose.h> for OSL_ENSURE

diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index fc4eb2c..36c244a 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
+#include <osl/diagnose.h>
 #include "tabcol.hxx"
 
 #include <limits.h> //for LONG_MAX


More information about the Libreoffice-commits mailing list