[Libreoffice-commits] .: 4 commits - sd/source svx/source vcl/StaticLibrary_vclmain.mk

[David Tardon]

 sd/source/ui/remotecontrol/Receiver.cxx         |    2 --
 sd/source/ui/toolpanel/TaskPaneFocusManager.cxx |    3 ++-
 svx/source/svdraw/svdotext.cxx                  |    3 ++-
 vcl/StaticLibrary_vclmain.mk                    |    4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 3494780dcdb98b70fca4f28c354eec9c081b59c5
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Aug 7 14:49:26 2012 +0200

    this file does not use base64 conversions at all
    
    Change-Id: I09fab1efbd6028bd245cf53674b31b9bbf0d4217

diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx
index 8cdedb7..b190a45 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -17,9 +17,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
-#include <xmlsec/base64.h>
 #include <rtl/ustrbuf.hxx>
-#include <sax/tools/converter.hxx>
 #include <rtl/strbuf.hxx>
 
 using namespace sd;
commit 8809d3989284cd169733dceaeb4710a265fb8ef4
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Aug 7 14:35:57 2012 +0200

    remove link first
    
    RemoveUnusedEventListener checks if there is a link for the window and
    does nothing in this case. And of course there is one, because it has
    not been removed yet .-)
    
    Change-Id: I198e951c1eb5318f1304a9519b33bedef6892660

diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
index 4f9698a..b145931 100644
--- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
@@ -238,8 +238,9 @@ void FocusManager::RemoveLinks (::Window* pWindow)
         {
             if (iLink->second.mpTargetWindow == pWindow)
             {
-                RemoveUnusedEventListener(iLink->first);
+                ::Window* const pSourceWindow(iLink->first);
                 mpLinks->erase(iLink);
+                RemoveUnusedEventListener(pSourceWindow);
                 bLinkRemoved = true;
                 break;
             }
commit ae0f9da65b7a41f72699217292cf39fe8460e2e2
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Aug 7 13:39:53 2012 +0200

    valgrind: add missing initializer
    
    Change-Id: I635d8f0b89d87c3b29bfd8f71c8c50f26da69c3a

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 76b5b34..37ba260 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -122,7 +122,8 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
     aRect(rNewRect),
     mpText(NULL),
     pEdtOutl(NULL),
-    pFormTextBoundRect(NULL)
+    pFormTextBoundRect(NULL),
+    eTextKind(OBJ_TEXT)
 {
     bTextSizeDirty=sal_False;
     bTextFrame=sal_False;
commit 5b60dac47d26782b5eb30cc641887b3989f2c46c
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Aug 7 10:45:09 2012 +0200

    salmain needs a header from tools
    
    Change-Id: Iad96199d00de9f739b0d003679b75510faca36f4

diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 24c811a..05a6f3e 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -28,6 +28,10 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
 
+$(eval $(call gb_StaticLibrary_use_packages,vclmain,\
+	tools_inc \
+))
+
 ifeq ($(OS),IOS)
 $(eval $(call gb_StaticLibrary_add_cxxflags,vclmain,\
     $(gb_OBJCXXFLAGS) \