[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits - desktop/source desktop/util svx/source

[Jan Holesovsky]

 desktop/source/pkgchk/unopkg/makefile.mk |    2 ++
 desktop/util/makefile.mk                 |   13 ++++++++-----
 svx/source/editeng/editdoc.cxx           |   11 +++++++++--
 3 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit f97e860a31ffb3535002e5cd31f37eb20eddc620
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Nov 4 10:48:25 2009 +0000

    #i106536# MacOSX: break at desktop: cp called without target (../unxmacxi.pro/bin/so/soffice_mac)

diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk
index 3562fad..4a1f409 100644
--- a/desktop/source/pkgchk/unopkg/makefile.mk
+++ b/desktop/source/pkgchk/unopkg/makefile.mk
@@ -49,6 +49,7 @@ PRJINC += ..$/..$/deployment ..$/..
 CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
 .ENDIF
 
+.IF "$(LINK_SO)"!=""
 APP1TARGET = so$/unopkg
 APP1OBJS = $(OBJFILES)
 APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB)
@@ -59,6 +60,7 @@ APP1RPATH = BRAND
 APP1ICON = $(SOLARRESDIR)$/icons/so9_main_app.ico
 APP1LINKRES = $(MISC)$/$(TARGET)1.res
 .ENDIF
+.ENDIF			# "$(LINK_SO)"!=""
 
 APP2TARGET = unopkg
 APP2OBJS = $(OBJFILES)
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 4dec3cd..7830552 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -287,22 +287,25 @@ $(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN)
 $(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN)
     $(COPY) $< $@
 
-ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST)
-.ELSE
-ALLTAR : $(BIN)$/soffice_oo$(EXECPOST)
+ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST)
 .ENDIF # "$(LINK_SO)"=="TRUE"
+ALLTAR : $(BIN)$/soffice_oo$(EXECPOST)
 .ENDIF
 
 .IF "$(OS)" == "MACOSX"
+.IF "$(LINK_SO)"=="TRUE"
 $(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN)
     $(COPY) $< $@
     
+ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST)
+.ENDIF # "$(LINK_SO)"=="TRUE"
+
 $(BIN)$/soffice_mac$(EXECPOST) : $(APP5TARGETN)
     $(COPY) $< $@
 
-ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST) $(BIN)$/soffice_mac$(EXECPOST)
+ALLTAR : $(BIN)$/soffice_mac$(EXECPOST)
 
-.ENDIF
+.ENDIF # "$(OS)" == "MACOSX"
 
 .IF "$(GUI)" == "WNT"
 
commit 1ffca0e2bc60f2a11d84a718f2968932eac32629
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Nov 4 09:38:06 2009 +0000

    CWS-TOOLING: integrate CWS tl75
    2009-10-20 15:29:06 +0200 tl  r277057 : #i98908# unsorted char attribute array fixed
    2009-10-19 13:31:12 +0200 ufi  r277022 : i86464
    2009-10-19 13:21:57 +0200 tl  r277020 : #i92190# dictionary update
    2009-10-19 12:10:05 +0200 tl  r277019 : #92190# dictionray update

diff --git a/svx/source/editeng/editdoc.cxx b/svx/source/editeng/editdoc.cxx
index 7160a41..d5f9ee1 100644
--- a/svx/source/editeng/editdoc.cxx
+++ b/svx/source/editeng/editdoc.cxx
@@ -1427,9 +1427,11 @@ XubString EditDoc::GetParaAsString( ContentNode* pNode, USHORT nStartPos, USHORT
         else
             pNextFeature = 0;	// Feature interessiert unten nicht
 
-
         DBG_ASSERT( nEnd >= nIndex, "Ende vorm Index?" );
-        aStr += XubString( *pNode, nIndex, nEnd-nIndex );
+        //!! beware of sub string length  of -1 which is also defined as STRING_LEN and 
+        //!! thus would result in adding the whole sub string up to the end of the node !!
+        if (nEnd > nIndex)
+            aStr += XubString( *pNode, nIndex, nEnd - nIndex );
 
         if ( pNextFeature )
         {
@@ -1790,7 +1792,12 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
     }
 
     if ( bChanged )
+    {
+        // char attributes need to be sorted by start again
+        pNode->GetCharAttribs().ResortAttribs();
+
         SetModified( TRUE );
+    }
 
     return bChanged;
 }