summaryrefslogtreecommitdiff
path: root/shell/inc
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-02-12 16:56:44 +0100
committerJens-Heiner Rechtien <hr@openoffice.org>2010-02-12 16:56:44 +0100
commitdb02ac8b89b8ec1e3d84f2676665667916582423 (patch)
tree55446fdc25ea149952589d200fb6b4224a6996f8 /shell/inc
parentae19e5feff59f578d3f8de6fe9c27f9a57ba63d1 (diff)
changefileheader2: #i10000#: convert files with CR/LF characters to CR only
Diffstat (limited to 'shell/inc')
-rw-r--r--shell/inc/internal/basereader.hxx2
-rw-r--r--shell/inc/internal/contentreader.hxx2
-rw-r--r--shell/inc/internal/metainforeader.hxx2
-rw-r--r--shell/inc/internal/types.hxx4
-rw-r--r--shell/inc/internal/zipfile.hxx12
5 files changed, 11 insertions, 11 deletions
diff --git a/shell/inc/internal/basereader.hxx b/shell/inc/internal/basereader.hxx
index 8aef93528806..fcdf1cdd7dff 100644
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/internal/basereader.hxx
@@ -47,7 +47,7 @@ public:
protected: // protected because its only an implementation relevant class
CBaseReader( const std::string& DocumentName );
- CBaseReader( void* stream, zlib_filefunc_def* fa );
+ CBaseReader( void* stream, zlib_filefunc_def* fa );
virtual void start_document();
diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx
index b4ed30970c46..63b0c550c534 100644
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/internal/contentreader.hxx
@@ -40,7 +40,7 @@ public:
//CContentReader( const std::string& DocumentName );
CContentReader( const std::string& DocumentName, LocaleSet_t const & DocumentLocale );
- CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa );
+ CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa );
/** Get the chunkbuffer.
diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx
index e936acc71d41..ea29dff07c80 100644
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/internal/metainforeader.hxx
@@ -43,7 +43,7 @@ public:
CMetaInfoReader( const std::string& DocumentName );
- CMetaInfoReader( void* stream, zlib_filefunc_def* fa);
+ CMetaInfoReader( void* stream, zlib_filefunc_def* fa);
/** check if the Tag is in the target meta.xml file.
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index d636595537e4..c11692912aec 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -33,8 +33,8 @@
#include <utility>
#include <vector>
#include <stack>
-#include <external/zlib/zlib.h>
-#include <external/zlib/ioapi.h>
+#include <external/zlib/zlib.h>
+#include <external/zlib/ioapi.h>
typedef std::vector<std::wstring> StringList_t;
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index d349f0294d11..a3e3575082c0 100644
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
@@ -32,9 +32,9 @@
#define _WINDOWS
#endif
-
-#include <external/zlib/unzip.h>
-
+
+#include <external/zlib/unzip.h>
+
#include <string>
#include <vector>
@@ -68,7 +68,7 @@ public:
*/
static bool IsZipFile(const std::string& FileName);
- static bool IsZipFile(void* stream);
+ static bool IsZipFile(void* stream);
/** Returns wheter the version of the specified zip file may be uncompressed with the
@@ -88,7 +88,7 @@ public:
*/
static bool IsValidZipFileVersionNumber(const std::string& FileName);
- static bool IsValidZipFileVersionNumber(void* stream);
+ static bool IsValidZipFileVersionNumber(void* stream);
public:
@@ -106,7 +106,7 @@ public:
*/
ZipFile(const std::string& FileName);
- ZipFile(void* stream, zlib_filefunc_def* fa);
+ ZipFile(void* stream, zlib_filefunc_def* fa);
/** Destroys a zip file