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

[Tor Lillqvist]

 patches/dev300/apply                                  |    5 ----
 patches/dev300/selection-crash-svx-svdmrkv.diff       |   11 ---------
 patches/ooxml/writerfilter-qnametostr-NOOPTFILES.diff |   21 ------------------
 3 files changed, 2 insertions(+), 35 deletions(-)

New commits:
commit 77760276580a55c4f755552312345dc23725462c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:14:17 2011 +0300

    writerfilter-qnametostr-NOOPTFILES.diff is already in

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 750c128..319ace6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -170,9 +170,6 @@ selection-crash-svx-svdmrkv.diff, i#76084, jianhua
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20624
 warning-return-values-stlport.diff, jholesov
 
-# gcc OOMs here otherwise (x86_64)
-writerfilter-qnametostr-NOOPTFILES.diff
-
 # don't let HelpLinker be miscompiled with g++ 4.3
 gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
 
diff --git a/patches/ooxml/writerfilter-qnametostr-NOOPTFILES.diff b/patches/ooxml/writerfilter-qnametostr-NOOPTFILES.diff
deleted file mode 100644
index 22b1971..0000000
--- a/patches/ooxml/writerfilter-qnametostr-NOOPTFILES.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- writerfilter/source/resourcemodel/makefile.mk |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git writerfilter/source/resourcemodel/makefile.mk writerfilter/source/resourcemodel/makefile.mk
-index f3869f3..4053ae0 100644
---- writerfilter/source/resourcemodel/makefile.mk
-+++ writerfilter/source/resourcemodel/makefile.mk
-@@ -48,6 +48,9 @@ CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
- NOOPTFILES= \
-     $(SLO)$/qnametostr.obj
- 
-+NOOPTFILES= \
-+    $(SLO)$/qnametostr.obj
-+
- SLOFILES= \
-     $(SLO)$/qnametostr.obj \
-     $(SLO)$/sprmcodetostr.obj \
--- 
-1.7.0.1
-
commit 14ae94f64a9093c7886508681ed43b339ab4308c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:10:54 2011 +0300

    Make selection-crash-svx-svdmrkv.diff apply again

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 06eea37..750c128 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -163,7 +163,7 @@ testtool-more-defaults.diff, martink
 
 #set default varchar lenght to 100.
 dbaccess-default-varchar-lenght.diff, i#62664, jianhua
-#for selection delete crash
+# for selection delete crash
 selection-crash-svx-svdmrkv.diff, i#76084, jianhua
 
 # temporary hack to avoid the warning about missing return values in gcc4
diff --git a/patches/dev300/selection-crash-svx-svdmrkv.diff b/patches/dev300/selection-crash-svx-svdmrkv.diff
index 3ec1fd8..5f112ac 100644
--- a/patches/dev300/selection-crash-svx-svdmrkv.diff
+++ b/patches/dev300/selection-crash-svx-svdmrkv.diff
@@ -1,15 +1,9 @@
----
- svx/source/svdraw/svdmrkv.cxx |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git svx/source/svdraw/svdmrkv.cxx svx/source/svdraw/svdmrkv.cxx
-index 3d72ef2..e2008cf 100644
 --- svx/source/svdraw/svdmrkv.cxx
 +++ svx/source/svdraw/svdmrkv.cxx
 @@ -227,6 +227,19 @@ void SdrMarkView::ModelHasChanged()
      GetMarkedObjectListWriteAccess().SetUnsorted();
      SortMarkedObjects();
-     bMrkPntDirty=TRUE;
+     bMrkPntDirty=sal_True;
 +    //remove empty maked SdrObject
 +    ULONG nMarkAnz=GetMarkedObjectCount();
 +    for (ULONG nMarkNum=nMarkAnz; nMarkNum>0;)
@@ -26,6 +20,3 @@ index 3d72ef2..e2008cf 100644
      UndirtyMrkPnt();
      SdrView* pV=(SdrView*)this;
      if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) { // an dieser Stelle habe ich ein ziemliches Problem !!!
--- 
-1.7.0.1
-