[Libreoffice-commits] .: 5 commits - shell/source ucb/source
Michael Stahl
mst at kemper.freedesktop.org
Fri Jul 13 05:03:49 PDT 2012
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 12 +++++-----
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx | 2 -
shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx | 4 +--
shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx | 2 -
ucb/source/ucp/cmis/cmis_content.cxx | 2 -
ucb/source/ucp/cmis/cmis_repo_content.cxx | 4 +--
6 files changed, 14 insertions(+), 12 deletions(-)
New commits:
commit 09a5a74956b96b69ec93687f5a902b1c4f937d9e
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 13 14:01:11 2012 +0200
warning C4267: conversion from 'size_t' to 'unsigned long'
Change-Id: I1d922e5b3c7959022b6f57c33b9a4976a16305f6
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index e4ace54..1ce8dfb 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -127,7 +127,7 @@ FileStream::~FileStream()
unsigned long FileStream::sread (unsigned char *buf, unsigned long size)
{
if (file)
- return fread(buf, 1, size, file);
+ return static_cast<unsigned long>(fread(buf, 1, size, file));
return 0;
}
commit 48ab773e681b1f129e9196c11f5d44b0caf3dbe9
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 13 12:41:42 2012 +0200
warning C4101: unreferenced local variable
Change-Id: I627c2641dcebea1daa5a9264d8b4a5771bf8155f
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 3349e0f..8404203 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -375,7 +375,7 @@ namespace cmis
else
SAL_INFO( "cmisucp", "Looking for unsupported property " << rProp.Name );
}
- catch ( const libcmis::Exception& e )
+ catch (const libcmis::Exception&)
{
xRow->appendVoid( rProp );
}
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index af501b3..233b2f0 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -128,7 +128,7 @@ namespace cmis
SAL_INFO( "cmisucp", "Looking for unsupported property " << rProp.Name );
}
}
- catch ( const libcmis::Exception& e )
+ catch (const libcmis::Exception&)
{
xRow->appendVoid( rProp );
}
@@ -156,7 +156,7 @@ namespace cmis
{
m_aRepositories = libcmis::SessionFactory::getRepositories( params );
}
- catch ( const libcmis::Exception& e )
+ catch (const libcmis::Exception&)
{
}
}
commit e61c2222550342457e93372aa6b03ea299e53722
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 13 12:26:51 2012 +0200
warning C4267: conversion from 'size_t' to 'DWORD'
Change-Id: Idd467f2963099e2ae6bb76f405124dfa32c8cc9a
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 1e7499e..9f37b3b 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -341,7 +341,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat)
continue;
}
m_pwsBuffer = m_pContentReader -> getChunkBuffer()[m_ChunkPosition].second;
- m_ulUnicodeBufferLen = m_pwsBuffer.length();
+ m_ulUnicodeBufferLen = static_cast<ULONG>(m_pwsBuffer.length());
DWORD ChunkLCID = LocaleSetToLCID( m_pContentReader -> getChunkBuffer()[m_ChunkPosition].first );
// Set chunk description
pStat->idChunk = m_ulChunkID;
@@ -1241,7 +1241,7 @@ namespace /* private */
0,
REG_MULTI_SZ,
reinterpret_cast<const BYTE*>(DllsToRegisterList),
- DllList.length() + 2);
+ static_cast<DWORD>(DllList.length() + 2));
RegCloseKey(hSubKey);
}
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 2312c26..45918f5 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -247,7 +247,7 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Stat(STATSTG *pstatstg, DWORD grfSt
pstatstg->type = STGTY_LOCKBYTES;
ULARGE_INTEGER uli;
- uli.LowPart = ref_zip_buffer_.size();
+ uli.LowPart = static_cast<DWORD>(ref_zip_buffer_.size());
uli.HighPart = 0;
pstatstg->cbSize = uli;
commit 958898510ceec7ff8f2fdb36165f981456f29be5
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 13 12:15:58 2012 +0200
clarify branding in comment
Change-Id: I3101b9f582861bc88ab694c551e66079f133e3e0
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 7d6b15d..1e7499e 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -31,9 +31,11 @@
// File: ooofilt.cxx
// Contents: Filter Implementation for OpenOffice.Org Document using
// Indexing Service
-// Summary: The LibreOffice filter reads LibreOffice files (with the
-// extension .sxw .sxi, etc) and extract their content, author,
-// keywords,subject,comments and title to be filtered.
+// Summary: The LibreOffice filter reads OpenOffice.org XML files (with
+// the extension .sxw .sxi, etc) and ODF files and extract
+// their content, author, keywords,subject,comments and title
+// to be filtered.
+//
// Platform: Windows 2000, Windows XP
//--------------------------------------------------------------------------
#include "internal/contentreader.hxx"
commit 9f41a8f30d22a1c7ac678ecdbdad5b60b1f334ed
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 13 11:53:13 2012 +0200
warning C4267: conversion from 'size_t' to 'int'
Change-Id: Id495b96f6f496f4ae16d9c9a3697f94c7b3f305c
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 5c0cd50..583d480 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -149,7 +149,7 @@ void list_view_builder::insert_item(const std::wstring& title, const std::wstrin
lvi.iSubItem = 0;
lvi.mask = LVIF_TEXT;
lvi.state = 0;
- lvi.cchTextMax = title.size() + 1;
+ lvi.cchTextMax = static_cast<int>(title.size() + 1);
lvi.stateMask = 0;
lvi.pszText = const_cast<wchar_t*>(title.c_str());
@@ -211,7 +211,7 @@ void winxp_list_view_builder::insert_group(const std::wstring& name)
lvg.cbSize = sizeof(lvg);
lvg.mask = LVGF_HEADER | LVGF_STATE | LVGF_GROUPID;
lvg.pszHeader = const_cast<wchar_t*>(name.c_str());
- lvg.cchHeader = name.size() + 1;
+ lvg.cchHeader = static_cast<int>(name.size() + 1);
lvg.iGroupId = ++group_count_;
lvg.state = LVGS_NORMAL;
lvg.uAlign = LVGA_HEADER_CENTER;
More information about the Libreoffice-commits
mailing list