summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--shell/source/win32/zipfile/zipfile.cxx2
-rw-r--r--sw/source/core/uibase/utlui/content.cxx2
2 files changed, 1 insertions, 3 deletions
diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx
index 270fbe1ec6bd..3ba0e91ae37d 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -204,7 +204,6 @@ static bool readCentralDirectoryEntry(StreamInterface *stream, CentralDirectoryE
entry.internal_attr = readShort(stream);
entry.external_attr = readInt(stream);
entry.offset = readInt(stream);
- unsigned short i = 0;
entry.filename.assign(readString(stream, entry.filename_size));
entry.extra_field.assign(readString(stream, entry.extra_field_size));
entry.file_comment.assign(readString(stream, entry.file_comment_size));
@@ -234,7 +233,6 @@ static bool readLocalFileHeader(StreamInterface *stream, LocalFileHeader &header
header.uncompressed_size = readInt(stream);
header.filename_size = readShort(stream);
header.extra_field_size = readShort(stream);
- unsigned short i = 0;
header.filename.assign(readString(stream, header.filename_size));
header.extra_field.assign(readString(stream, header.extra_field_size));
}
diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx
index 11781347ec90..6a2fbf911784 100644
--- a/sw/source/core/uibase/utlui/content.cxx
+++ b/sw/source/core/uibase/utlui/content.cxx
@@ -1494,7 +1494,7 @@ bool SwContentTree::Expand( SvTreeListEntry* pParent )
bool SwContentTree::Collapse( SvTreeListEntry* pParent )
{
- bool bRet;
+ bool bRet(false);
if(!bIsRoot || (((SwContentType*)pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) ||
(nRootType == CONTENT_TYPE_OUTLINE))
{