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

[Jan Holesovsky]

 sw/source/ui/index/cnttab.cxx |    4 ++--
 sw/util/makefile.mk           |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 8f39e7ac1de3201638ac97ad908f038ddb9ac4a4
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Feb 23 09:32:46 2011 +0100

    Fix debug build of sw.

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 74476b2..c9c265b 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3318,7 +3318,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
     sMessage += String::CreateFromInt32(nSpace);
     sMessage += String::CreateFromAscii(" | ");
 
-    for (const_ctrl_iterator it = aControlList.begin(); it != aControlList.end(); ++it)
+    for (ctrl_const_iterator it = aControlList.begin(); it != aControlList.end(); ++it)
     {
         long nDebugXPos = it->GetPosPixel().X();
         long nDebugWidth = it->GetSizePixel().Width();
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index 9b07ba1..5539505 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -160,8 +160,6 @@ SHL2OBJS=   $(SLO)$/swdetect.obj \
         $(SLO)$/iodetect.obj
 
 .IF "$(DBG_LEVEL)">="2"
-SHL2OBJS+=  \
-        $(SLO)$/errhdl.obj
 SHL2STDLIBS+= \
         $(LIBXML2LIB)
 .ENDIF
commit 8ef3e10bfca3b8bd728b8ca836dc9406c3cb85c4
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Feb 22 16:19:26 2011 +0100

    Make FindControl() function static.

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index add255a..74476b2 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -111,7 +111,7 @@ static const sal_Unicode aDeliEnd	 = ']'; //fuer die form
 #define IDX_FILE_EXTENSION String::CreateFromAscii( \
                             RTL_CONSTASCII_STRINGPARAM( "*.sdi" ))
 
-boost::ptr_vector<Control>::iterator FindControl (boost::ptr_vector<Control> &list, Control *ctrl)
+static boost::ptr_vector<Control>::iterator FindControl (boost::ptr_vector<Control> &list, Control *ctrl)
 {
     for (boost::ptr_vector<Control>::iterator it = list.begin(); it != list.end(); ++it)
     {