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

Michael Stahl mst at kemper.freedesktop.org
Fri Jul 13 02:28:28 PDT 2012


 shell/source/all/xml_parser.cxx                    |    3 ++-
 shell/source/win32/shlxthandler/util/utilities.cxx |   17 -----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

New commits:
commit d6ee925423ef00dc16ad3cd939bc64d19e7fc922
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 13 00:08:36 2012 +0200

    shell: remove dead SaveDebugInfoToFile
    
    Change-Id: I18655247f0e836cefd2791e1c78cf9f49e396d02

diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index 214d63e..f426869 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -110,23 +110,6 @@ bool is_windows_xp_or_above()
 }
 
 //---------------------------------
-/**
-*/
-
-void SaveDebugInfoToFile( const std::wstring& str )
-{
-   int handle;
-
-   if ((handle = open("c:\\temp\\SHELLRESULT.$$$", O_CREAT | O_RDWR | O_APPEND )) == -1)
-   {
-      perror("Error: open file error");
-      return;
-   }
-   write(handle, str.c_str(), str.length() );
-   close(handle);
-}
-
-//---------------------------------
 /** helper function to judge if the string is only has spaces.
     @returns
         <TRUE>if the provided string contains only but at least one space
commit b8c1742c400ab79887cc068635227616cf528fe4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 13 00:06:00 2012 +0200

    warning C4267: conversion from 'size_t' to 'int'
    
    Change-Id: I00e5e4f959c351004d8c1181c124cc6a1058b666

diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 6c2daaa..24a3ce9 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -177,7 +177,8 @@ void xml_parser::init()
 
 void xml_parser::parse(const char* XmlData, size_t Length, bool IsFinal)
 {
-    if (XML_STATUS_ERROR == XML_Parse(xml_parser_, XmlData, Length, IsFinal))
+    if (XML_STATUS_ERROR ==
+            XML_Parse(xml_parser_, XmlData, static_cast<int>(Length), IsFinal))
     {
         throw xml_parser_exception(
             (char*)XML_ErrorString(XML_GetErrorCode(xml_parser_)),


More information about the Libreoffice-commits mailing list