You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/06/30 18:36:35 UTC
[openoffice] branch AOO42X updated: Maintenance cleanup. fixed typos
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new a6cd7a7250 Maintenance cleanup. fixed typos
a6cd7a7250 is described below
commit a6cd7a72509693d908b9057814d440549596eafd
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Jun 30 20:34:25 2023 +0200
Maintenance cleanup. fixed typos
(cherry picked from commit 0ba0bc4aae3d6774eb9ed9cba4036e1ea29e2025)
---
main/shell/inc/internal/basereader.hxx | 22 ++---
main/shell/inc/internal/contentreader.hxx | 30 +++----
main/shell/inc/internal/xml_parser.hxx | 45 ++++++-----
main/shell/inc/internal/zipfile.hxx | 73 ++++++++---------
main/shell/qa/zip/ziptest.cxx | 20 ++---
main/shell/source/all/ooofilereader/dummytag.hxx | 25 +++---
main/shell/source/tools/lngconvex/cmdline.cxx | 13 +--
main/shell/source/tools/lngconvex/cmdline.hxx | 40 +++++-----
.../source/win32/shlxthandler/classfactory.cxx | 48 +++++------
.../source/win32/shlxthandler/classfactory.hxx | 44 +++++-----
.../win32/shlxthandler/util/fileextensions.cxx | 93 +++++++++++-----------
11 files changed, 236 insertions(+), 217 deletions(-)
diff --git a/main/shell/inc/internal/basereader.hxx b/main/shell/inc/internal/basereader.hxx
index bc43a23f6c..c336cbca90 100644
--- a/main/shell/inc/internal/basereader.hxx
+++ b/main/shell/inc/internal/basereader.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
+
#ifndef BASEREADER_HXX_INCLUDED
#define BASEREADER_HXX_INCLUDED
@@ -40,18 +40,18 @@ class CBaseReader : public i_xml_parser_event_handler
public:
virtual ~CBaseReader();
-protected: // protected because its only an implementation relevant class
+protected: // protected because it's only an implementation relevant class
CBaseReader( const std::string& DocumentName );
CBaseReader( void* stream, zlib_filefunc_def* fa );
virtual void start_document();
-
+
virtual void end_document();
virtual void start_element(
- const std::wstring& raw_name,
- const std::wstring& local_name,
+ const std::wstring& raw_name,
+ const std::wstring& local_name,
const XmlTagAttributes_t& attributes) = 0;
virtual void end_element(
@@ -71,6 +71,8 @@ protected: // protected because its only an implementation relevant class
private:
ZipFile m_ZipFile;
ZipFile::ZipContentBuffer_t m_ZipContent;
-};
+};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/shell/inc/internal/contentreader.hxx b/main/shell/inc/internal/contentreader.hxx
index 2b6cdf526d..5e770e505a 100644
--- a/main/shell/inc/internal/contentreader.hxx
+++ b/main/shell/inc/internal/contentreader.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -41,12 +41,12 @@ public:
/** Get the chunkbuffer.
- @return
+ @return
the chunkbuffer of the document.
*/
inline ChunkBuffer_t const & getChunkBuffer( ) const{ return m_ChunkBuffer; };
-protected: // protected because its only an implementation relevant class
+protected: // protected because it's only an implementation relevant class
/** start_element occurs when a tag is start.
@@ -58,8 +58,8 @@ protected: // protected because its only an implementation relevant class
attribute structure.
*/
virtual void start_element(
- const std::wstring& raw_name,
- const std::wstring& local_name,
+ const std::wstring& raw_name,
+ const std::wstring& local_name,
const XmlTagAttributes_t& attributes);
/** end_element occurs when a tag is closed
@@ -79,7 +79,7 @@ protected: // protected because its only an implementation relevant class
*/
virtual void characters(const std::wstring& character);
-protected:
+protected:
/** choose an appropriate tag reader to handle the tag.
@param tag_name
@@ -87,13 +87,13 @@ protected:
@param XmlAttributes
attribute structure of the tag to save in.
*/
- ITag* chooseTagReader(
+ ITag* chooseTagReader(
const std::wstring& tag_name, const XmlTagAttributes_t& XmlAttributes );
/** Get the list of style locale pair.
- @return
- the Style-Locale map
+ @return
+ the Style-Locale map
*/
inline StyleLocaleMap_t const & getStyleMap( ) const{ return m_StyleMap; };
@@ -112,11 +112,13 @@ protected:
LocaleSet_t const & getLocale( const StyleName_t Style );
private:
- std::stack<ITag*> m_TagBuilderStack;
+ std::stack<ITag*> m_TagBuilderStack;
ChunkBuffer_t m_ChunkBuffer;
StyleLocaleMap_t m_StyleMap;
LocaleSet_t m_DefaultLocale;
-};
+};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/shell/inc/internal/xml_parser.hxx b/main/shell/inc/internal/xml_parser.hxx
index 07ac3c91a6..cfee8f06e9 100644
--- a/main/shell/inc/internal/xml_parser.hxx
+++ b/main/shell/inc/internal/xml_parser.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
+
#ifndef _XML_PARSER_HXX_
#define _XML_PARSER_HXX_
@@ -28,15 +28,15 @@
#include <stdexcept>
//-----------------------------------------------------
-class xml_parser_exception : public std::runtime_error
+class xml_parser_exception : public std::runtime_error
{
public:
xml_parser_exception(
- const std::string& error_msg,
- int error_code,
- int line_number,
- int column_number,
+ const std::string& error_msg,
+ int error_code,
+ int line_number,
+ int column_number,
long byte_index) :
std::runtime_error(error_msg),
error_code_(error_code),
@@ -58,7 +58,7 @@ public:
//-----------------------------------------------------
class i_xml_parser_event_handler;
-class xml_parser
+class xml_parser
{
public:
//########################################################
@@ -69,7 +69,7 @@ public:
//########################################################
/** Parse a XML data stream
-
+
@param pXmlData
Pointer to a buffer containing the xml data
@@ -78,17 +78,17 @@ public:
@param IsFinal
Indicates whether these are the last xml data
- of an xml document to parse. For very large
- xml documents it may be useful to read and
+ of an xml document to parse. For very large
+ xml documents it may be useful to read and
parse the document partially.
@precond XmlData must not be null
-
+
@throws SaxException
If the used Sax parser returns an error. The SaxException
contains detailed information about the error. */
void parse(const char* XmlData, size_t Length, bool IsFinal = true);
-
+
//########################################################
/** Set a document handler
@@ -102,29 +102,30 @@ public:
no longer exist.
@param SaxDocumentHandler
- The new document handler, may be null if not interessted in
+ The new document handler, may be null if not interested in
sax parser events.
@postcond currently used document handler == pSaxDocumentHandler */
void set_document_handler(i_xml_parser_event_handler* event_handler);
//########################################################
- /** Returns the currently used document handler or null if
+ /** Returns the currently used document handler or null if
no document handler was set before. */
i_xml_parser_event_handler* get_document_handler() const;
private:
-
+
void init();
private:
- i_xml_parser_event_handler* document_handler_;
+ i_xml_parser_event_handler* document_handler_;
XML_Parser xml_parser_;
// prevent copy and assignment
private:
xml_parser(const xml_parser&);
- xml_parser& operator=(const xml_parser&);
+ xml_parser& operator=(const xml_parser&);
};
-#endif
+#endif
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/shell/inc/internal/zipfile.hxx b/main/shell/inc/internal/zipfile.hxx
index 6179bd0fbb..90802a7cef 100644
--- a/main/shell/inc/internal/zipfile.hxx
+++ b/main/shell/inc/internal/zipfile.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
+
#ifndef ZIPFILE_HXX_INCLUDED
#define ZIPFILE_HXX_INCLUDED
@@ -52,71 +52,71 @@ public:
typedef std::vector<char> ZipContentBuffer_t;
public:
-
+
/** Checks whether a file is a zip file or not
@precond The given parameter must be a string with length > 0
The file must exist
The file must be readable for the current user
-
- @returns true if the file is a zip file
+
+ @returns true if the file is a zip file
false if the file is not a zip file
-
- @throws ParameterException if the given file name is empty
+
+ @throws ParameterException if the given file name is empty
IOException if the specified file doesn't exist
- AccessViolationException if read access to the file is denied
+ AccessViolationException if read access to the file is denied
*/
static bool IsZipFile(const std::string& FileName);
static bool IsZipFile(void* stream);
-
- /** Returns wheter the version of the specified zip file may be uncompressed with the
- currently used zlib version or not
-
+
+ /** Returns whether the version of the specified zip file may be uncompressed with the
+ currently used zlib version or not
+
@precond The given parameter must be a string with length > 0
The file must exist
The file must be readable for the current user
The file must be a valid zip file
-
+
@returns true if the file may be uncompressed with the currently used zlib
false if the file may not be uncompressed with the currently used zlib
-
- @throws ParameterException if the given file name is empty
+
+ @throws ParameterException if the given file name is empty
IOException if the specified file doesn't exist or is no zip file
- AccessViolationException if read access to the file is denied
+ AccessViolationException if read access to the file is denied
*/
static bool IsValidZipFileVersionNumber(const std::string& FileName);
-
+
static bool IsValidZipFileVersionNumber(void* stream);
public:
-
+
/** Constructs a zip file from a zip file
-
+
@precond The given parameter must be a string with length > 0
The file must exist
The file must be readable for the current user
-
- @throws ParameterException if the given file name is empty
+
+ @throws ParameterException if the given file name is empty
IOException if the specified file doesn't exist or is no valid zip file
AccessViolationException if read access to the file is denied
- WrongZipVersionException if the zip file cannot be uncompressed
+ WrongZipVersionException if the zip file cannot be uncompressed
with the used zlib version
*/
ZipFile(const std::string& FileName);
ZipFile(void* stream, zlib_filefunc_def* fa);
-
+
/** Destroys a zip file
*/
~ZipFile();
-
+
/** Provides an interface to read the uncompressed data of a content of the zip file
-
+
@param ContentName
- The name of the content in the zip file
+ The name of the content in the zip file
@param ppstm
Pointer to pointer, will receive an interface pointer
@@ -125,21 +125,21 @@ public:
@precond The specified content must exist in this file
ppstm must not be NULL
- @throws std::bad_alloc if the necessary buffer could not be
+ @throws std::bad_alloc if the necessary buffer could not be
allocated
- ZipException if an zip error occurs
+ ZipException if a zip error occurs
ZipContentMissException if the specified zip content
does not exist in this zip file
*/
void GetUncompressedContent(const std::string& ContentName, /*inout*/ ZipContentBuffer_t& ContentBuffer);
-
+
/** Returns a list with the content names contained within this file
-
+
@throws ZipException if an error in the zlib happens
*/
DirectoryPtr_t GetDirectory() const;
- /** Convenience query function may even realized with
+ /** Convenience query function may even realized with
iterating over a ZipFileDirectory returned by
GetDirectory
*/
@@ -150,13 +150,14 @@ private:
/** Returns the length of the longest file name
in the current zip file
- @throws ZipException if an zip error occurs
+ @throws ZipException if a zip error occurs
*/
long GetFileLongestFileNameLength() const;
-
+
private:
unzFile m_uzFile;
};
#endif
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/shell/qa/zip/ziptest.cxx b/main/shell/qa/zip/ziptest.cxx
index 12bb646cc7..bb20baac1f 100644
--- a/main/shell/qa/zip/ziptest.cxx
+++ b/main/shell/qa/zip/ziptest.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -35,12 +35,12 @@ class Test : public ::testing::Test
public:
Test();
void SetUp() {}
- void TearDown() {}
+ void TearDown() {}
};
Test::Test() :
documentName("simpledocument.odt")
-{
+{
}
//------------------------------------------------
@@ -64,11 +64,13 @@ TEST_F(Test, test_getContent)
{
TestZipImpl testImpl(documentName.c_str());
bool isPassed = testImpl.test_getContent();
- ASSERT_TRUE(isPassed) << "Couldn't receive content buffer form zipfile.";
+ ASSERT_TRUE(isPassed) << "Couldn't receive content buffer from zipfile.";
}
int main(int argc, char **argv)
{
- ::testing::InitGoogleTest(&argc, argv);
- return RUN_ALL_TESTS();
+ ::testing::InitGoogleTest(&argc, argv);
+ return RUN_ALL_TESTS();
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/shell/source/all/ooofilereader/dummytag.hxx b/main/shell/source/all/ooofilereader/dummytag.hxx
index 33295ce2f6..39423739e5 100644
--- a/main/shell/source/all/ooofilereader/dummytag.hxx
+++ b/main/shell/source/all/ooofilereader/dummytag.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,21 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#ifndef DUMMYTAG_HXX_INCLUDED
#define DUMMYTAG_HXX_INCLUDED
@@ -29,10 +28,10 @@
/*************************** dummy tag readers ***************************/
-/** Implements the ITag interface but does
- nothing (Null object pattern), may be used for
- tags we are not interessted in to avoid if-else
- branches.
+/** Implements the ITag interface but does
+ nothing (Null object pattern), may be used for
+ tags we are not interested in to avoid if-else
+ branches.
*/
class CDummyTag : public ITag
{
@@ -46,12 +45,14 @@ class CDummyTag : public ITag
virtual void addAttributes(const XmlTagAttributes_t& /*attributes*/){};
virtual std::wstring getTagContent( void )
- {
- return EMPTY_STRING;
+ {
+ return EMPTY_STRING;
};
- virtual ::std::wstring const getTagAttribute( ::std::wstring const & /*attrname*/ ){ return ::std::wstring(EMPTY_STRING); };
+ virtual ::std::wstring const getTagAttribute( ::std::wstring const & /*attrname*/ ){ return ::std::wstring(EMPTY_STRING); };
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/shell/source/tools/lngconvex/cmdline.cxx b/main/shell/source/tools/lngconvex/cmdline.cxx
index a250118521..1914b938ed 100644
--- a/main/shell/source/tools/lngconvex/cmdline.cxx
+++ b/main/shell/source/tools/lngconvex/cmdline.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,21 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
#include <stdexcept>
@@ -104,7 +103,7 @@ StringListPtr_t CommandLine::get_arg_names() const
/** Returns an argument by name. If there are
duplicate argument names in the command line,
the first one wins.
- Argument name an the argument value must be separated
+ Argument name and the argument value must be separated
by spaces. If the argument value starts with an
argument prefix use quotes else the return value is
an empty string because the value will be interpreted
@@ -169,3 +168,5 @@ bool CommandLine::is_arg_name(const std::string& Argument) const
{
return (0 == Argument.compare(0, m_argprefix.length(), m_argprefix));
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/shell/source/tools/lngconvex/cmdline.hxx b/main/shell/source/tools/lngconvex/cmdline.hxx
index 471ac6c5c5..a70843e24d 100644
--- a/main/shell/source/tools/lngconvex/cmdline.hxx
+++ b/main/shell/source/tools/lngconvex/cmdline.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,24 +7,26 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
+
#ifndef _CMDLINE_HXX_
#define _CMDLINE_HXX_
#include "defs.hxx"
-//---------------------------------
+//---------------------------------
/** Simple command line abstraction
*/
@@ -49,42 +51,42 @@ public:
*/
size_t get_arg_count() const;
- /** Return an argument by index
+ /** Return an argument by index
This method doesn't skip argument
names if any, so if the second
- argument is an argument name the
+ argument is an argument name the
function nevertheless returns it.
@precond 0 <= Index < GetArgumentCount
- @throws std::out_of_range exception
+ @throws std::out_of_range exception
if the given index is to high
*/
std::string get_arg(size_t Index) const;
- /** Returns all argument name found in the
+ /** Returns all argument name found in the
command line. An argument will be identified
by a specified prefix. The standard prefix
is '-'.
- If there are no argument names the returned
+ If there are no argument names the returned
container is empty.
*/
StringListPtr_t get_arg_names() const;
- /** Returns an argument by name. If there are
+ /** Returns an argument by name. If there are
duplicate argument names in the command line,
the first one wins.
- Argument name an the argument value must be separated
- by spaces. If the argument value starts with an
+ Argument name and the argument value must be separated
+ by spaces. If the argument value starts with an
argument prefix use quotes else the return value is
- an empty string because the value will be interpreted
+ an empty string because the value will be interpreted
as the next argument name.
- If an argument value contains spaces use quotes.
+ If an argument value contains spaces use quotes.
@precond GetArgumentNames() -> has element ArgumentName
- @throws std::invalid_argument exception
- if the specified argument could not be
+ @throws std::invalid_argument exception
+ if the specified argument could not be
found
*/
std::string get_arg(const std::string& ArgumentName) const;
@@ -95,7 +97,7 @@ public:
//################################
- /** Set the prefix used to identify arguments in
+ /** Set the prefix used to identify arguments in
the command line.
@precond prefix is not empty
@@ -123,3 +125,5 @@ private:
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/shell/source/win32/shlxthandler/classfactory.cxx b/main/shell/source/win32/shlxthandler/classfactory.cxx
index 3a3094fc84..ea3d09c474 100644
--- a/main/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/main/shell/source/win32/shlxthandler/classfactory.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -46,8 +46,8 @@ long CClassFactory::s_ServerLocks = 0;
//
//-----------------------------
-CClassFactory::CClassFactory(const CLSID& clsid) :
- m_RefCnt(1),
+CClassFactory::CClassFactory(const CLSID& clsid) :
+ m_RefCnt(1),
m_Clsid(clsid)
{
InterlockedIncrement(&g_DllRefCnt);
@@ -70,7 +70,7 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_
{
*ppvObject = 0;
- if (IID_IUnknown == riid || IID_IClassFactory == riid)
+ if (IID_IUnknown == riid || IID_IClassFactory == riid)
{
IUnknown* pUnk = this;
pUnk->AddRef();
@@ -84,7 +84,7 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_
//-----------------------------
//
//-----------------------------
-
+
ULONG STDMETHODCALLTYPE CClassFactory::AddRef(void)
{
return InterlockedIncrement(&m_RefCnt);
@@ -93,7 +93,7 @@ ULONG STDMETHODCALLTYPE CClassFactory::AddRef(void)
//-----------------------------
//
//-----------------------------
-
+
ULONG STDMETHODCALLTYPE CClassFactory::Release(void)
{
long refcnt = InterlockedDecrement(&m_RefCnt);
@@ -108,28 +108,28 @@ ULONG STDMETHODCALLTYPE CClassFactory::Release(void)
// IClassFactory methods
//-----------------------------
-HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
- IUnknown __RPC_FAR *pUnkOuter,
- REFIID riid,
- void __RPC_FAR *__RPC_FAR *ppvObject)
+HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
+ IUnknown __RPC_FAR *pUnkOuter,
+ REFIID riid,
+ void __RPC_FAR *__RPC_FAR *ppvObject)
{
if ((pUnkOuter != NULL))
return CLASS_E_NOAGGREGATION;
-
+
IUnknown* pUnk = 0;
if (CLSID_PROPERTYSHEET_HANDLER == m_Clsid)
pUnk = static_cast<IShellExtInit*>(new CPropertySheet());
else if (CLSID_INFOTIP_HANDLER == m_Clsid)
- pUnk = static_cast<IQueryInfo*>(new CInfoTip());
-
+ pUnk = static_cast<IQueryInfo*>(new CInfoTip());
+
else if (CLSID_COLUMN_HANDLER == m_Clsid)
pUnk = static_cast<IColumnProvider*>(new CColumnInfo());
- else if (CLSID_THUMBVIEWER_HANDLER == m_Clsid)
- pUnk = static_cast<IExtractImage*>(new CThumbviewer());
-
+ else if (CLSID_THUMBVIEWER_HANDLER == m_Clsid)
+ pUnk = static_cast<IExtractImage*>(new CThumbviewer());
+
POST_CONDITION(pUnk != 0, "Could not create COM object");
if (0 == pUnk)
@@ -146,14 +146,14 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
//-----------------------------
//
//-----------------------------
-
+
HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock)
{
- if (fLock)
- InterlockedIncrement(&s_ServerLocks);
+ if (fLock)
+ InterlockedIncrement(&s_ServerLocks);
else
InterlockedDecrement(&s_ServerLocks);
-
+
return S_OK;
}
@@ -165,3 +165,5 @@ bool CClassFactory::IsLocked()
{
return (s_ServerLocks > 0);
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/shell/source/win32/shlxthandler/classfactory.hxx b/main/shell/source/win32/shlxthandler/classfactory.hxx
index a4c7ccd7ad..0b4583b9e1 100644
--- a/main/shell/source/win32/shlxthandler/classfactory.hxx
+++ b/main/shell/source/win32/shlxthandler/classfactory.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
+
#ifndef CLASSFACTORY_HXX_INCLUDED
#define CLASSFACTORY_HXX_INCLUDED
@@ -30,9 +30,9 @@
#include <objidl.h>
#if defined _MSC_VER
#pragma warning(pop)
-#endif
+#endif
-class CClassFactory : public IClassFactory
+class CClassFactory : public IClassFactory
{
public:
CClassFactory(const CLSID& clsid);
@@ -42,32 +42,34 @@ public:
// IUnknown methods
//-----------------------------
- virtual HRESULT STDMETHODCALLTYPE QueryInterface(
- REFIID riid,
- void __RPC_FAR *__RPC_FAR *ppvObject);
-
- virtual ULONG STDMETHODCALLTYPE AddRef(void);
-
- virtual ULONG STDMETHODCALLTYPE Release(void);
+ virtual HRESULT STDMETHODCALLTYPE QueryInterface(
+ REFIID riid,
+ void __RPC_FAR *__RPC_FAR *ppvObject);
+
+ virtual ULONG STDMETHODCALLTYPE AddRef(void);
+
+ virtual ULONG STDMETHODCALLTYPE Release(void);
//-----------------------------
// IClassFactory methods
//-----------------------------
- virtual HRESULT STDMETHODCALLTYPE CreateInstance(
- IUnknown __RPC_FAR *pUnkOuter,
- REFIID riid,
- void __RPC_FAR *__RPC_FAR *ppvObject);
-
- virtual HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
+ virtual HRESULT STDMETHODCALLTYPE CreateInstance(
+ IUnknown __RPC_FAR *pUnkOuter,
+ REFIID riid,
+ void __RPC_FAR *__RPC_FAR *ppvObject);
+
+ virtual HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
static bool IsLocked();
private:
- long m_RefCnt;
+ long m_RefCnt;
CLSID m_Clsid;
static long s_ServerLocks;
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/shell/source/win32/shlxthandler/util/fileextensions.cxx b/main/shell/source/win32/shlxthandler/util/fileextensions.cxx
index 937fd4dbcb..adcaf23052 100644
--- a/main/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/main/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -31,38 +31,38 @@
//------------------------------------
const std::string WRITER_FILE_EXTENSIONS = "sxwstwsxgodtottodm";
-const std::string CALC_FILE_EXTENSIONS = "sxcstcodsots";
+const std::string CALC_FILE_EXTENSIONS = "sxcstcodsots";
const std::string DRAW_FILE_EXTENSIONS = "sxdstdodgotg";
const std::string IMPRESS_FILE_EXTENSIONS = "sxistiodpotp";
const std::string MATH_FILE_EXTENSIONS = "sxmodf";
const std::string WEB_FILE_EXTENSIONS = "oth";
const std::string DATABASE_FILE_EXTENSIONS = "odb";
-
+
FileExtensionEntry OOFileExtensionTable[] = {
- { ".sxw", L".sxw", "soffice.StarWriterDocument.6" },
- { ".sxc", L".sxc", "soffice.StarCalcDocument.6" },
- { ".sxi", L".sxi", "soffice.StarImpressDocument.6" },
- { ".sxd", L".sxd", "soffice.StarDrawDocument.6" },
- { ".sxm", L".sxm", "soffice.StarMathDocument.6" },
- { ".stw", L".stw", "soffice.StarWriterTemplate.6" },
- { ".sxg", L".sxg", "soffice.StarWriterGlobalDocument.6"},
- { ".std", L".std", "soffice.StarDrawTemplate.6" },
- { ".sti", L".sti", "soffice.StarImpressTemplate.6" },
- { ".stc", L".stc", "soffice.StarCalcTemplate.6" },
- { ".odt", L".odt", "opendocument.WriterDocument.1" },
+ { ".sxw", L".sxw", "soffice.StarWriterDocument.6" },
+ { ".sxc", L".sxc", "soffice.StarCalcDocument.6" },
+ { ".sxi", L".sxi", "soffice.StarImpressDocument.6" },
+ { ".sxd", L".sxd", "soffice.StarDrawDocument.6" },
+ { ".sxm", L".sxm", "soffice.StarMathDocument.6" },
+ { ".stw", L".stw", "soffice.StarWriterTemplate.6" },
+ { ".sxg", L".sxg", "soffice.StarWriterGlobalDocument.6" },
+ { ".std", L".std", "soffice.StarDrawTemplate.6" },
+ { ".sti", L".sti", "soffice.StarImpressTemplate.6" },
+ { ".stc", L".stc", "soffice.StarCalcTemplate.6" },
+ { ".odt", L".odt", "opendocument.WriterDocument.1" },
{ ".ott", L".ott", "opendocument.WriterTemplate.1" },
{ ".odm", L".odm", "opendocument.WriterGlobalDocument.1" },
{ ".oth", L".oth", "opendocument.WriterWebTemplate.1" },
- { ".ods", L".ods", "opendocument.CalcDocument.1" },
- { ".ots", L".ots", "opendocument.CalcTemplate.1" },
- { ".odg", L".odg", "opendocument.DrawDocument.1" },
- { ".otg", L".otg", "opendocument.DrawTemplate.1" },
- { ".odp", L".odp", "opendocument.ImpressDocument.1" },
+ { ".ods", L".ods", "opendocument.CalcDocument.1" },
+ { ".ots", L".ots", "opendocument.CalcTemplate.1" },
+ { ".odg", L".odg", "opendocument.DrawDocument.1" },
+ { ".otg", L".otg", "opendocument.DrawTemplate.1" },
+ { ".odp", L".odp", "opendocument.ImpressDocument.1" },
{ ".otp", L".otp", "opendocument.ImpressTemplate.1" },
{ ".odf", L".odf", "opendocument.MathDocument.1" },
{ ".odb", L".odb", "opendocument.DatabaseDocument.1" }
- };
-
+ };
+
size_t OOFileExtensionTableSize = sizeof(OOFileExtensionTable)/sizeof(OOFileExtensionTable[0]);
@@ -86,31 +86,32 @@ std::string get_file_name_extension(const std::string& file_name)
char easytolower( char in )
{
- if( in<='Z' && in>='A' )
- return in-('Z'-'z');
- return in;
+ if( in<='Z' && in>='A' )
+ return in-('Z'-'z');
+ return in;
}
File_Type_t get_file_type(const std::string& file_name)
{
- std::string fext = get_file_name_extension(file_name);
- std::transform(fext.begin(), fext.end(), fext.begin(), easytolower);
-
- if (std::string::npos != WRITER_FILE_EXTENSIONS.find(fext))
- return WRITER;
- else if (std::string::npos != CALC_FILE_EXTENSIONS.find(fext))
- return CALC;
- else if (std::string::npos != DRAW_FILE_EXTENSIONS.find(fext))
- return DRAW;
- else if (std::string::npos != IMPRESS_FILE_EXTENSIONS.find(fext))
- return IMPRESS;
- else if (std::string::npos != MATH_FILE_EXTENSIONS.find(fext))
- return MATH;
- else if (std::string::npos != WEB_FILE_EXTENSIONS.find(fext))
- return WEB;
- else if (std::string::npos != DATABASE_FILE_EXTENSIONS.find(fext))
- return DATABASE;
- else
- return UNKNOWN;
+ std::string fext = get_file_name_extension(file_name);
+ std::transform(fext.begin(), fext.end(), fext.begin(), easytolower);
+
+ if (std::string::npos != WRITER_FILE_EXTENSIONS.find(fext))
+ return WRITER;
+ else if (std::string::npos != CALC_FILE_EXTENSIONS.find(fext))
+ return CALC;
+ else if (std::string::npos != DRAW_FILE_EXTENSIONS.find(fext))
+ return DRAW;
+ else if (std::string::npos != IMPRESS_FILE_EXTENSIONS.find(fext))
+ return IMPRESS;
+ else if (std::string::npos != MATH_FILE_EXTENSIONS.find(fext))
+ return MATH;
+ else if (std::string::npos != WEB_FILE_EXTENSIONS.find(fext))
+ return WEB;
+ else if (std::string::npos != DATABASE_FILE_EXTENSIONS.find(fext))
+ return DATABASE;
+ else
+ return UNKNOWN;
}
+/* vim: set noet sw=4 ts=4: */