diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2011-04-05 10:16:07 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-04-05 10:16:07 +0200 |
| commit | 45f0cc2ec176f02592a4e67942b1220f7837ab9f (patch) | |
| tree | 792241b1efd30744250b98879149c36aedf4f75e /shell | |
| parent | fe44fe403e57155cb479cd8e9cfbb77e1ba4fb01 (diff) | |
Remove commented code in libs-core/shell
Diffstat (limited to 'shell')
46 files changed, 6 insertions, 679 deletions
diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx index 3d1650c559bc..6a7dc594af60 100644 --- a/shell/inc/internal/contentreader.hxx +++ b/shell/inc/internal/contentreader.hxx @@ -38,7 +38,6 @@ class CContentReader : public CBaseReader public: virtual ~CContentReader(); - //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 ); diff --git a/shell/inc/internal/i_xml_parser_event_handler.hxx b/shell/inc/internal/i_xml_parser_event_handler.hxx index af0844d2654f..710efc062ab5 100644 --- a/shell/inc/internal/i_xml_parser_event_handler.hxx +++ b/shell/inc/internal/i_xml_parser_event_handler.hxx @@ -44,7 +44,6 @@ typedef std::map<string_t, string_t> xml_tag_attribute_container_t; -//######################################### class i_xml_parser_event_handler { public: diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx index bf6c5d1536f7..a806d02768dd 100644 --- a/shell/inc/internal/types.hxx +++ b/shell/inc/internal/types.hxx @@ -41,13 +41,10 @@ typedef std::vector<std::wstring> StringList_t; //+------------------------------------------------------------------------- -// // Declare: XmlTagAttributes_t, xml tag attribute struct // XmlTag_t, xml tag including content and attributes. // XmlTags_t, tags defined with tag name and xml tag. -// // Contents: Definitions of xml tag used in parser. -// //-------------------------------------------------------------------------- typedef std::wstring Name_t; typedef std::wstring Value_t; @@ -60,13 +57,10 @@ typedef std::map<Name_t, XmlTag_t> XmlTags_t; const XmlTag_t EMPTY_XML_TAG = std::make_pair(std::wstring(), XmlTagAttributes_t()); //+------------------------------------------------------------------------- -// // Declare: Language_t, language of the Locale pair // Country_t, country of the Local pair // LocaleSet_t, Local pair -// // Contents: Definitions of Chunk properties. -// //-------------------------------------------------------------------------- typedef ::std::wstring Language_t; typedef ::std::wstring Country_t; @@ -80,12 +74,9 @@ const LocaleSet_t EMPTY_LOCALE = ::std::make_pair(::std::wstring(), ::std::wstri const Chunk_t EMPTY_CHUNK = ::std::make_pair( EMPTY_LOCALE, ::std::wstring()); //+------------------------------------------------------------------------- -// // Declare: StyleName_t, style name of a style-locale pair. // StyleLocaleMap, the map of Styple-Locale pair. -// // Contents: Definitions of Style Names. -// //-------------------------------------------------------------------------- typedef ::std::wstring StyleName_t; typedef ::std::pair <StyleName_t, LocaleSet_t> StyleLocalePair_t; diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx index d57110deaf29..fbf7cf2e03ce 100644 --- a/shell/inc/internal/xml_parser.hxx +++ b/shell/inc/internal/xml_parser.hxx @@ -66,13 +66,10 @@ class i_xml_parser_event_handler; class xml_parser { public: - //######################################################## xml_parser(const XML_Char* EncodingName = 0); - //######################################################## ~xml_parser(); - //######################################################## /** Parse a XML data stream @param pXmlData @@ -94,7 +91,6 @@ public: contains detailed information about the error. */ void parse(const char* XmlData, size_t Length, bool IsFinal = true); - //######################################################## /** Set a document handler @descr A document handler implements the interface i_xml_parser_event_handler. @@ -113,7 +109,6 @@ public: @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 no document handler was set before. */ i_xml_parser_event_handler* get_document_handler() const; diff --git a/shell/qa/i_xml_parser_event_handler.hxx b/shell/qa/i_xml_parser_event_handler.hxx index e929989bff48..5ff98ff75972 100644 --- a/shell/qa/i_xml_parser_event_handler.hxx +++ b/shell/qa/i_xml_parser_event_handler.hxx @@ -43,7 +43,6 @@ typedef std::map<string_t, string_t> xml_tag_attribute_container_t; -//######################################### class i_xml_parser_event_handler { public: diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx index f90154e24727..e0907dbff486 100644 --- a/shell/qa/recent_docs.cxx +++ b/shell/qa/recent_docs.cxx @@ -39,14 +39,12 @@ #include <stdlib.h> #include <iostream> -//######################################## using namespace osl; using ::rtl::OUString; namespace syssh = SystemShell; -//######################################## const OUString SXW_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.writer")); const OUString SXC_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.calc")); const OUString SXI_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.impress")); @@ -218,7 +216,6 @@ public: }; -//##################################### // register test suites CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_AddToRecentDocs, "Test_AddToRecentDocs"); diff --git a/shell/source/all/ooofilereader/basereader.cxx b/shell/source/all/ooofilereader/basereader.cxx index 39752fe70515..2c0f8bdb3522 100644 --- a/shell/source/all/ooofilereader/basereader.cxx +++ b/shell/source/all/ooofilereader/basereader.cxx @@ -43,8 +43,6 @@ m_ZipFile( DocumentName ) } //------------------------------ -// -//------------------------------ CBaseReader::CBaseReader(void * sw, zlib_filefunc_def* fa): m_ZipFile( sw , fa ) @@ -52,24 +50,18 @@ m_ZipFile( sw , fa ) } //------------------------------ -// -//------------------------------ CBaseReader::~CBaseReader() { } //------------------------------ -// -//------------------------------ void CBaseReader::start_document() { } //------------------------------ -// -//------------------------------ void CBaseReader::end_document() { diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx index 71665ce9fd0d..10d7f88a8580 100644 --- a/shell/source/all/xml_parser.cxx +++ b/shell/source/all/xml_parser.cxx @@ -37,7 +37,6 @@ namespace /* private */ { - //###################################################### /* Extracts the local part of tag without namespace decoration e.g. meta:creator -> creator */ const XML_Char COLON = (XML_Char)':'; @@ -60,14 +59,12 @@ namespace /* private */ return p; } - //################################################ inline xml_parser* get_parser_instance(void* data) { return reinterpret_cast<xml_parser*>(XML_GetUserData( reinterpret_cast<XML_Parser>(data))); } - //################################################ bool has_only_whitespaces(const XML_Char* s, int len) { const XML_Char* p = s; @@ -77,7 +74,6 @@ namespace /* private */ } } -//################################################### xml_parser::xml_parser(const XML_Char* EncodingName) : document_handler_(0), xml_parser_(XML_ParserCreate(EncodingName)) @@ -85,17 +81,14 @@ xml_parser::xml_parser(const XML_Char* EncodingName) : init(); } -//################################################### xml_parser::~xml_parser() { XML_ParserFree(xml_parser_); } -//################################################### /* Callback functions will be called by the parser on different events */ -//################################################### extern "C" { @@ -123,7 +116,6 @@ static void xml_start_element_handler(void* UserData, const XML_Char* name, cons } } -//################################################### static void xml_end_element_handler(void* UserData, const XML_Char* name) { assert(UserData); @@ -134,7 +126,6 @@ static void xml_end_element_handler(void* UserData, const XML_Char* name) pDocHdl->end_element(reinterpret_cast<const char_t*>(name), reinterpret_cast<const char_t*>(get_local_name(name))); } -//################################################### static void xml_character_data_handler(void* UserData, const XML_Char* s, int len) { assert(UserData); @@ -150,7 +141,6 @@ static void xml_character_data_handler(void* UserData, const XML_Char* s, int le } } -//################################################### static void xml_comment_handler(void* UserData, const XML_Char* Data) { assert(UserData); @@ -163,7 +153,6 @@ static void xml_comment_handler(void* UserData, const XML_Char* Data) } // extern "C" -//################################################### void xml_parser::init() { XML_SetUserData(xml_parser_, this); @@ -188,7 +177,6 @@ void xml_parser::init() xml_comment_handler); } -//################################################### void xml_parser::parse(const char* XmlData, size_t Length, bool IsFinal) { if (0 == XML_Parse(xml_parser_, XmlData, Length, IsFinal)) @@ -200,14 +188,12 @@ void xml_parser::parse(const char* XmlData, size_t Length, bool IsFinal) XML_GetCurrentByteIndex(xml_parser_)); } -//################################################### void xml_parser::set_document_handler( i_xml_parser_event_handler* event_handler) { document_handler_ = event_handler; } -//################################################### i_xml_parser_event_handler* xml_parser::get_document_handler() const { return document_handler_; diff --git a/shell/source/all/zipfile/zipexcptn.hxx b/shell/source/all/zipfile/zipexcptn.hxx index 80ddfe9702bc..0b635448f482 100644 --- a/shell/source/all/zipfile/zipexcptn.hxx +++ b/shell/source/all/zipfile/zipexcptn.hxx @@ -1,7 +1,5 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // ZipException.h: interface for the ZipException class. -// -////////////////////////////////////////////////////////////////////// #ifndef ZIPEXCPTN_HXX_INCLUDED #define ZIPEXCPTN_HXX_INCLUDED diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 578d67c85db6..fbc29a5858c4 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -57,8 +57,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail" //----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- namespace { @@ -69,7 +67,7 @@ namespace } //----------------------------------------------------------------------- -// the 3 important functions which will be exported +// the 2 important functions which will be exported //----------------------------------------------------------------------- extern "C" diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx index 6b0a37d31c21..36c934c85033 100644 --- a/shell/source/cmdmail/cmdmailmsg.cxx +++ b/shell/source/cmdmail/cmdmailmsg.cxx @@ -55,8 +55,6 @@ using namespace com::sun::star::uno; //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) throw (RuntimeException) @@ -66,8 +64,6 @@ void SAL_CALL CmdMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) } //------------------------------------------------ -// -//------------------------------------------------ ::rtl::OUString SAL_CALL CmdMailMsg::getRecipient( ) throw (RuntimeException) @@ -77,8 +73,6 @@ void SAL_CALL CmdMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient ) throw (RuntimeException) @@ -88,8 +82,6 @@ void SAL_CALL CmdMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipie } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CmdMailMsg::getCcRecipient( ) throw (RuntimeException) @@ -99,8 +91,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getCcRecipient( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient ) throw (RuntimeException) @@ -110,8 +100,6 @@ void SAL_CALL CmdMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecip } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CmdMailMsg::getBccRecipient( ) throw (RuntimeException) @@ -121,8 +109,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getBccRecipient( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setOriginator( const OUString& aOriginator ) throw (RuntimeException) @@ -132,8 +118,6 @@ void SAL_CALL CmdMailMsg::setOriginator( const OUString& aOriginator ) } //------------------------------------------------ -// -//------------------------------------------------ OUString SAL_CALL CmdMailMsg::getOriginator( ) throw (RuntimeException) @@ -143,8 +127,6 @@ OUString SAL_CALL CmdMailMsg::getOriginator( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setSubject( const OUString& aSubject ) throw (RuntimeException) @@ -154,8 +136,6 @@ void SAL_CALL CmdMailMsg::setSubject( const OUString& aSubject ) } //------------------------------------------------ -// -//------------------------------------------------ OUString SAL_CALL CmdMailMsg::getSubject( ) throw (RuntimeException) @@ -165,8 +145,6 @@ OUString SAL_CALL CmdMailMsg::getSubject( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CmdMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAttachment ) throw (IllegalArgumentException, RuntimeException) @@ -176,8 +154,6 @@ void SAL_CALL CmdMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAt } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CmdMailMsg::getAttachement( ) throw (RuntimeException) @@ -187,8 +163,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getAttachement( ) } //------------------------------------------------ -// -//------------------------------------------------ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) @@ -218,8 +192,6 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName ) } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) throw (::com::sun::star::uno::RuntimeException) @@ -252,8 +224,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) } //------------------------------------------------ -// -//------------------------------------------------ sal_Bool SAL_CALL CmdMailMsg::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException) @@ -282,8 +252,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) } //------------------------------------------------ -// -//------------------------------------------------ Type SAL_CALL CmdMailMsg::getElementType( ) throw (RuntimeException) @@ -293,8 +261,6 @@ Type SAL_CALL CmdMailMsg::getElementType( ) } //------------------------------------------------ -// -//------------------------------------------------ sal_Bool SAL_CALL CmdMailMsg::hasElements( ) throw (RuntimeException) diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index a01d75253726..2bd36e9e9e8d 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -95,8 +95,6 @@ namespace // private } // end private namespace //------------------------------------------------- -// -//------------------------------------------------- CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) : WeakImplHelper3< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo >() diff --git a/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx index c31685ac3ea5..350bb7949223 100644 --- a/shell/source/tools/lngconvex/cmdline.cxx +++ b/shell/source/tools/lngconvex/cmdline.cxx @@ -37,9 +37,7 @@ /** Simple command line abstraction */ -//################################ // Creation -//################################ CommandLine::CommandLine(size_t argc, char* argv[], const std::string& ArgPrefix) : @@ -50,9 +48,7 @@ CommandLine::CommandLine(size_t argc, char* argv[], const std::string& ArgPrefix } -//################################ // Query -//################################ /** Return the argument count @@ -144,9 +140,7 @@ std::string CommandLine::get_arg(const std::string& ArgumentName) const } -//################################ // Command -//################################ /** Set the prefix used to identify arguments in diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx index c12f0fb31aba..efee314fa9e0 100644 --- a/shell/source/tools/lngconvex/cmdline.hxx +++ b/shell/source/tools/lngconvex/cmdline.hxx @@ -12,17 +12,13 @@ class CommandLine { public: - //################################ // Creation - //################################ CommandLine(size_t argc, char* argv[], const std::string& ArgPrefix = std::string("-")); - //################################ // Query - //################################ /** Return the argument count @@ -70,9 +66,7 @@ public: std::string get_arg(const std::string& ArgumentName) const; - //################################ // Command - //################################ /** Set the prefix used to identify arguments in diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index ada243f1edd4..364ac49ba4bd 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -69,7 +69,6 @@ namespace /* private */ using rtl::OUString; using rtl::OString; -//########################################### void ShowUsage() { std::cout << "Usage: -ulf ulf_file -rc rc_output_file -rct rc_template_file -rch rch_file -rcf rcf_file" << std::endl; @@ -80,15 +79,12 @@ void ShowUsage() std::cout << "-rcf Name of the resource file footer" << std::endl; } -//########################################### inline OUString OStringToOUString(const OString& str) { return rtl::OStringToOUString(str, osl_getThreadTextEncoding()); } -//########################################### inline OString OUStringToOString(const OUString& str) { return rtl::OUStringToOString(str, osl_getThreadTextEncoding()); } -//########################################### /** Get the directory where the module is located as system directory, the returned directory has a trailing '\' */ @@ -102,7 +98,6 @@ OUString get_module_path() return module_path; } -//########################################### /** Make the absolute directory of a base and a relative directory, if the relative directory is absolute the the relative @@ -128,7 +123,6 @@ OUString get_absolute_path( return abs_sys_path; } -//########################################### OString get_absolute_file_path(const std::string& file_name) { OUString fp = get_absolute_path( @@ -136,7 +130,6 @@ OString get_absolute_file_path(const std::string& file_name) return OUStringToOString(fp); } -//########################################### /** A helper class, enables stream exceptions on construction, restors the old exception state on destruction */ @@ -163,7 +156,6 @@ private: typedef std::vector<std::string> string_container_t; -//########################################### class iso_lang_identifier { public: @@ -209,7 +201,6 @@ private: OString country_; }; -//########################################### /** Convert a OUString to the MS resource file format string e.g. OUString -> L"\x1A00\x2200\x3400" */ @@ -228,14 +219,12 @@ std::string make_winrc_unicode_string(const OUString& str) return oss.str(); } -//########################################### std::string make_winrc_unicode_string(const std::string& str) { return make_winrc_unicode_string( OUString::createFromAscii(str.c_str())); } -//################################################ /** A replacement table contains pairs of placeholders and the appropriate substitute */ class Substitutor @@ -323,7 +312,6 @@ private: typedef std::map< unsigned short , std::string , std::less< unsigned short > > shortmap; -//########################################### void add_group_entries( Config& aConfig, const ByteString& GroupName, @@ -365,7 +353,6 @@ void add_group_entries( } } -//########################################### void read_ulf_file(const std::string& FileName, Substitutor& Substitutor) { // work-around for #i32420# @@ -405,7 +392,6 @@ void read_ulf_file(const std::string& FileName, Substitutor& Substitutor) throw; } - //Config config(OStringToOUString(FileName.c_str()).getStr()); // end work-around for #i32420# @@ -415,7 +401,6 @@ void read_ulf_file(const std::string& FileName, Substitutor& Substitutor) add_group_entries(config, config.GetGroupName(sal::static_int_cast<USHORT>(i)), Substitutor); } -//########################################### void read_file( const std::string& fname, string_container_t& string_container) @@ -436,7 +421,6 @@ void read_file( } } -//########################################### /** A simple helper function that appens the content of one file to another one */ void concatenate_files(std::ostream& os, std::istream& is) @@ -457,7 +441,6 @@ void concatenate_files(std::ostream& os, std::istream& is) } } -//########################################### bool is_placeholder(const std::string& str) { return ((str.length() > 1) && @@ -465,7 +448,6 @@ bool is_placeholder(const std::string& str) ('%' == str[str.length() - 1])); } -//########################################### void start_language_section( std::ostream_iterator<std::string>& ostream_iter, const iso_lang_identifier& iso_lang) { @@ -482,7 +464,7 @@ void start_language_section( // Esp. for spanish we don't want to distinguish between trad. // and internatinal sorting ( which leads to two different sub languages ) // Setting the sub language to neutral allows us to use one - // stringlist for all spanish variants ( see #123126# ) + // stringlist for all spanish variants if ( ( primLangID == LANG_SPANISH ) && ( subLangID == SUBLANG_SPANISH ) ) subLangID = SUBLANG_NEUTRAL; @@ -498,7 +480,6 @@ void start_language_section( ostream_iter = lang_section; } -//########################################### /** Iterate all languages in the substitutor, replace the all placeholder and append the result to the output file */ @@ -533,7 +514,7 @@ void inflate_rc_template_to_file( iss >> token; substitutor.substitute(token); - // #110274# HACK for partially merged + // HACK for partially merged // *.lng files where some strings have // a particular language that others // don't have in order to keep the @@ -551,7 +532,6 @@ void inflate_rc_template_to_file( } // namespace /* private */ -//#################################################### /* MAIN The file names provided via command line should be absolute or relative to the directory of this module. diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 3ec2536af2ff..29f3a922c499 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -103,8 +103,6 @@ void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL) } //----------------------------------------------------------------------------------------- -// -//----------------------------------------------------------------------------------------- ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : WeakImplHelper2< XSystemShellExecute, XServiceInfo >(), @@ -129,8 +127,6 @@ ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : } //------------------------------------------------- -// -//------------------------------------------------- void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException) diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index d7816c2df66b..f56309b07bf3 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -56,8 +56,6 @@ using com::sun::star::system::XSystemShellExecute; #define SHELLEXEC_REGKEY_NAME "/com.sun.star.comp.system.SystemShellExecute/UNO/SERVICES/com.sun.star.system.SystemShellExecute" //----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- namespace { diff --git a/shell/source/unix/sysshell/recently_used_file.hxx b/shell/source/unix/sysshell/recently_used_file.hxx index b34da5bc86ae..da2c1865e9b3 100644 --- a/shell/source/unix/sysshell/recently_used_file.hxx +++ b/shell/source/unix/sysshell/recently_used_file.hxx @@ -32,7 +32,6 @@ #include <stdio.h> #include <unistd.h> -//################################## // simple wrapper around the recently_used_file class recently_used_file diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index b34bb3ad81a3..262cc34eb647 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -47,7 +47,6 @@ #include <string.h> namespace /* private */ { - //######################################## typedef std::vector<string_t> string_container_t; #define TAG_RECENT_FILES "RecentFiles" @@ -219,11 +218,9 @@ namespace /* private */ { typedef std::vector<recently_used_item*> recently_used_item_list_t; typedef void (recently_used_item::* SET_COMMAND)(const string_t&); - //######################################## // thrown if we encounter xml tags that we do not know class unknown_xml_format_exception {}; - //######################################## class recently_used_file_filter : public i_xml_parser_event_handler { public: @@ -475,7 +472,6 @@ namespace /* private */ { } // namespace private -//########################################### /* example (see http::www.freedesktop.org): <?xml version="1.0"?> diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 46ca21240d57..c5ef891911bb 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -189,7 +189,6 @@ namespace // private #define E_UNKNOWN_EXEC_ERROR -1 //----------------------------------------- - //----------------------------------------- bool is_system_path(const OUString& path_or_uri) { @@ -219,7 +218,6 @@ namespace // private } //----------------------------------------- - //----------------------------------------- bool is_existing_file(const OUString& file_name) { @@ -261,8 +259,6 @@ namespace // private } // end namespace //----------------------------------------------------------------------------------------- -// -//----------------------------------------------------------------------------------------- CSysShExec::CSysShExec( ) : WeakComponentImplHelper2< XSystemShellExecute, XServiceInfo >( m_aMutex ) @@ -279,8 +275,6 @@ CSysShExec::CSysShExec( ) : } //------------------------------------------------- -// -//------------------------------------------------- void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException) diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index 514b7f84375f..fce2894af2a6 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -58,8 +58,6 @@ using com::sun::star::system::XSystemShellExecute; #define SYSSHEXEC_REGKEY_NAME "/com.sun.star.system.SystemShellExecute/UNO/SERVICES/com.sun.star.system.SystemShellExecute" //----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- namespace { @@ -70,7 +68,7 @@ namespace } //----------------------------------------------------------------------- -// the 3 important functions which will be exported +// the 2 important functions which will be exported //----------------------------------------------------------------------- extern "C" diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index 20ba047f3844..422c2be34ecc 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -42,14 +42,10 @@ using ::std::min; #include "internal/shlxthdl.hxx" //----------------------------- -// -//----------------------------- long CClassFactory::s_ServerLocks = 0; //----------------------------- -// -//----------------------------- CClassFactory::CClassFactory(const CLSID& clsid) : m_RefCnt(1), @@ -59,8 +55,6 @@ CClassFactory::CClassFactory(const CLSID& clsid) : } //----------------------------- -// -//----------------------------- CClassFactory::~CClassFactory() { @@ -87,8 +81,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_ } //----------------------------- -// -//----------------------------- ULONG STDMETHODCALLTYPE CClassFactory::AddRef(void) { @@ -96,8 +88,6 @@ ULONG STDMETHODCALLTYPE CClassFactory::AddRef(void) } //----------------------------- -// -//----------------------------- ULONG STDMETHODCALLTYPE CClassFactory::Release(void) { @@ -149,8 +139,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( } //----------------------------- -// -//----------------------------- HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) { @@ -163,8 +151,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) } //----------------------------- -// -//----------------------------- bool CClassFactory::IsLocked() { diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index 7531d14eb9ba..80f98b5a3119 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -39,8 +39,6 @@ #include <malloc.h> //---------------------------- -// -//---------------------------- namespace /* private */ { @@ -58,8 +56,6 @@ namespace /* private */ } //---------------------------- -// -//---------------------------- CColumnInfo::CColumnInfo(long RefCnt) : m_RefCnt(RefCnt) @@ -68,8 +64,6 @@ CColumnInfo::CColumnInfo(long RefCnt) : } //---------------------------- -// -//---------------------------- CColumnInfo::~CColumnInfo() { @@ -96,8 +90,6 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FA } //---------------------------- -// -//---------------------------- ULONG STDMETHODCALLTYPE CColumnInfo::AddRef(void) { @@ -105,8 +97,6 @@ ULONG STDMETHODCALLTYPE CColumnInfo::AddRef(void) } //---------------------------- -// -//---------------------------- ULONG STDMETHODCALLTYPE CColumnInfo::Release( void) { @@ -145,14 +135,11 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO ZeroMemory(psci->wszTitle, sizeof(psci->wszTitle)); wcsncpy(psci->wszTitle, ColumnInfoTable[dwIndex].wszTitle, (sizeof(psci->wszTitle) - 1)); - //wcscpy(psci->wszTitle, ColumnInfoTable[dwIndex].wszTitle); return S_OK; } //----------------------------- -// -//----------------------------- HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData) { @@ -219,8 +206,6 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOL } //----------------------------- -// -//----------------------------- bool CColumnInfo::IsOOFileExtension(wchar_t* Extension) const { diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx index b88defc42aa5..8c6d701b6e25 100644 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -50,8 +50,6 @@ const std::wstring WSPACE = std::wstring(SPACE); //----------------------------- -// -//----------------------------- CInfoTip::CInfoTip(long RefCnt) : m_RefCnt(RefCnt) @@ -61,8 +59,6 @@ CInfoTip::CInfoTip(long RefCnt) : } //----------------------------- -// -//----------------------------- CInfoTip::~CInfoTip() { @@ -98,8 +94,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR * } //---------------------------- -// -//---------------------------- ULONG STDMETHODCALLTYPE CInfoTip::AddRef(void) { @@ -107,8 +101,6 @@ ULONG STDMETHODCALLTYPE CInfoTip::AddRef(void) } //---------------------------- -// -//---------------------------- ULONG STDMETHODCALLTYPE CInfoTip::Release( void) { @@ -285,7 +277,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws } catch (const std::exception&) { - //return E_FAIL; } //display file size, no matter other infomation is loaded successfully or not. @@ -321,8 +312,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws } //---------------------------- -// -//---------------------------- HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoFlags(DWORD * /*pdwFlags*/ ) { @@ -358,7 +347,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ std::string fnameA = WStringToString(fname); - // #115531# // ZeroMemory because strncpy doesn't '\0'-terminates the destination // string; reserve the last place in the buffer for the final '\0' // that's why '(sizeof(m_szFileName) - 1)' @@ -369,8 +357,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ } //---------------------------- -// -//---------------------------- HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty(void) { @@ -378,8 +364,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty(void) } //---------------------------- -// -//---------------------------- HRESULT STDMETHODCALLTYPE CInfoTip::Save(LPCOLESTR /*pszFileName*/, BOOL /*fRemember*/) { @@ -387,8 +371,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Save(LPCOLESTR /*pszFileName*/, BOOL /*fReme } //---------------------------- -// -//---------------------------- HRESULT STDMETHODCALLTYPE CInfoTip::SaveCompleted(LPCOLESTR /*pszFileName*/) { @@ -396,8 +378,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::SaveCompleted(LPCOLESTR /*pszFileName*/) } //---------------------------- -// -//---------------------------- HRESULT STDMETHODCALLTYPE CInfoTip::GetCurFile(LPOLESTR __RPC_FAR * /*ppszFileName*/) { diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index 98289cb06420..91c7592ac3de 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -31,16 +31,12 @@ //-------------------------------------------------------------------------- // File: ooofilt.cxx -// // Contents: Filter Implementation for OpenOffice.Org Document using // Indexing Service -// // Summary: The OpenOffice.org filter reads OpenOffice.org files (with the // extension .sxw .sxi, etc) and extract their content, author, // keywords,subject,comments and title to be filtered. -// // Platform: Windows 2000, Windows XP -// //-------------------------------------------------------------------------- #include "internal/contentreader.hxx" #include "internal/metainforeader.hxx" @@ -48,9 +44,7 @@ #include "internal/fileextensions.hxx" //-------------------------------------------------------------------------- -// // Include file Purpose -// // windows.h Win32 declarations // string.h string wstring declarations // filter.h IFilter interface declarations @@ -59,7 +53,6 @@ // assert.h assertion function. // ooofilt.hxx OpenOffice.org filter declarations // propspec.hxx PROPSPEC -// //-------------------------------------------------------------------------- #if defined _MSC_VER @@ -86,22 +79,14 @@ using ::std::min; #include "internal/stream_helper.hxx" //C------------------------------------------------------------------------- -// // Class: COooFilter -// // Summary: Implements OpenOffice.org filter class -// //-------------------------------------------------------------------------- //M------------------------------------------------------------------------- -// // Method: COooFilter::COooFilter -// // Summary: Class constructor -// // Arguments: void -// // Purpose: Manages global instance count -// //-------------------------------------------------------------------------- COooFilter::COooFilter() : m_lRefs(1), @@ -124,15 +109,10 @@ COooFilter::COooFilter() : InterlockedIncrement( &g_lInstances ); } //M------------------------------------------------------------------------- -// // Method: COooFilter::~COooFilter -// // Summary: Class destructor -// // Arguments: void -// // Purpose: Manages global instance count and file handle -// //-------------------------------------------------------------------------- COooFilter::~COooFilter() { @@ -147,21 +127,16 @@ COooFilter::~COooFilter() } //M------------------------------------------------------------------------- -// // Method: COooFilter::QueryInterface (IUnknown::QueryInterface) -// // Summary: Queries for requested interface -// // Arguments: riid // [in] Reference IID of requested interface // ppvObject // [out] Address that receives requested interface pointer -// // Returns: S_OK // Interface is supported // E_NOINTERFACE // Interface is not supported -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::QueryInterface( REFIID riid, @@ -188,30 +163,20 @@ SCODE STDMETHODCALLTYPE COooFilter::QueryInterface( return S_OK; } //M------------------------------------------------------------------------- -// // Method: COooFilter::AddRef (IUnknown::AddRef) -// // Summary: Increments interface refcount -// // Arguments: void -// // Returns: Value of incremented interface refcount -// //-------------------------------------------------------------------------- ULONG STDMETHODCALLTYPE COooFilter::AddRef() { return InterlockedIncrement( &m_lRefs ); } //M------------------------------------------------------------------------- -// // Method: COooFilter::Release (IUnknown::Release) -// // Summary: Decrements interface refcount, deleting if unreferenced -// // Arguments: void -// // Returns: Value of decremented interface refcount -// //-------------------------------------------------------------------------- ULONG STDMETHODCALLTYPE COooFilter::Release() { @@ -222,11 +187,8 @@ ULONG STDMETHODCALLTYPE COooFilter::Release() return ulTmp; } //M------------------------------------------------------------------------- -// // Method: COooFilter::Init (IFilter::Init) -// // Summary: Initializes OpenOffice.org filter instance -// // Arguments: grfFlags // [in] Flags for filter behavior // cAttributes @@ -235,7 +197,6 @@ ULONG STDMETHODCALLTYPE COooFilter::Release() // [in] Array of requested attribute strings // pFlags // [out] Pointer to return flags for additional properties -// // Returns: S_OK // Initialization succeeded // E_FAIL @@ -246,7 +207,6 @@ ULONG STDMETHODCALLTYPE COooFilter::Release() // Unable to access file to be filtered // FILTER_E_PASSWORD // (not implemented) -// //-------------------------------------------------------------------------- const int COUNT_ATTRIBUTES = 5; @@ -339,11 +299,8 @@ SCODE STDMETHODCALLTYPE COooFilter::Init( return S_OK; } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetChunk (IFilter::GetChunk) -// // Summary: Gets the next chunk -// // Arguments: ppStat // [out] Pointer to description of current chunk // Returns: S_OK @@ -360,7 +317,6 @@ SCODE STDMETHODCALLTYPE COooFilter::Init( // (not implemented) // FILTER_E_PASSWORD // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat) { @@ -445,24 +401,19 @@ SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat) }//for(;;) } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetText (IFilter::GetText) -// // Summary: Retrieves UNICODE text for index -// // Arguments: pcwcBuffer // [in] Pointer to size of UNICODE buffer // [out] Pointer to count of UNICODE characters returned // awcBuffer // [out] Pointer to buffer to receive UNICODE text -// // Returns: S_OK // Text successfully retrieved, but text remains in chunk // FILTER_E_NO_MORE_TEXT // All of the text in the current chunk has been returned // FILTER_S_LAST_TEXT // Next call to GetText will return FILTER_E_NO_MORE_TEXT -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffer) { @@ -496,17 +447,12 @@ SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffe } } //M------------------------------------------------------------------------- -// // Method: GetMetaInfoNameFromPropertyId -// // Summary: helper function to convert PropertyID into respective // MetaInfo names. -// // Arguments: ulPropID // [in] property ID -// // Returns: corresponding metainfo names. -// //-------------------------------------------------------------------------- ::std::wstring GetMetaInfoNameFromPropertyId( ULONG ulPropID ) @@ -522,19 +468,14 @@ SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffe } } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetValue (IFilter::GetValue) -// // Summary: Retrieves properites for index -// // Arguments: ppPropValue // [out] Address that receives pointer to property value -// // Returns: FILTER_E_NO_VALUES // Always // FILTER_E_NO_MORE_VALUES // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::GetValue(PROPVARIANT ** ppPropValue) @@ -569,23 +510,18 @@ SCODE STDMETHODCALLTYPE COooFilter::GetValue(PROPVARIANT ** ppPropValue) return E_FAIL; } //M------------------------------------------------------------------------- -// // Method: COooFilter::BindRegion (IFilter::BindRegion) -// // Summary: Creates moniker or other interface for indicated text -// // Arguments: origPos // [in] Description of text location and extent // riid // [in] Reference IID of specified interface // ppunk // [out] Address that receives requested interface pointer -// // Returns: E_NOTIMPL // Always // FILTER_W_REGION_CLIPPED // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::BindRegion( @@ -597,14 +533,10 @@ SCODE STDMETHODCALLTYPE COooFilter::BindRegion( return E_NOTIMPL; } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetClassID (IPersist::GetClassID) -// // Summary: Retrieves the class id of the filter class -// // Arguments: pClassID // [out] Pointer to the class ID of the filter -// // Returns: S_OK // Always // E_FAIL @@ -616,18 +548,13 @@ SCODE STDMETHODCALLTYPE COooFilter::GetClassID(CLSID * pClassID) return S_OK; } //M------------------------------------------------------------------------- -// // Method: COooFilter::IsDirty (IPersistFile::IsDirty) -// // Summary: Checks whether file has changed since last save -// // Arguments: void -// // Returns: S_FALSE // Always // S_OK // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::IsDirty() { @@ -635,24 +562,19 @@ SCODE STDMETHODCALLTYPE COooFilter::IsDirty() return S_FALSE; } //M------------------------------------------------------------------------- -// // Method: COooFilter::Load (IPersistFile::Load) -// // Summary: Opens and initializes the specified file -// // Arguments: pszFileName // [in] Pointer to zero-terminated string // of absolute path of file to open // dwMode // [in] Access mode to open the file -// // Returns: S_OK // File was successfully loaded // E_OUTOFMEMORY // File could not be loaded due to insufficient memory // E_FAIL // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/) { @@ -677,22 +599,17 @@ SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/) return S_OK; } //M------------------------------------------------------------------------- -// // Method: COooFilter::Save (IPersistFile::Save) -// // Summary: Saves a copy of the current file being filtered -// // Arguments: pszFileName // [in] Pointer to zero-terminated string of // absolute path of where to save file // fRemember // [in] Whether the saved copy is made the current file -// // Returns: E_FAIL // Always // S_OK // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::Save(LPCWSTR /*pszFileName*/, BOOL /*fRemember*/) { @@ -700,18 +617,13 @@ SCODE STDMETHODCALLTYPE COooFilter::Save(LPCWSTR /*pszFileName*/, BOOL /*fRememb return E_FAIL; } //M------------------------------------------------------------------------- -// // Method: COooFilter::SaveCompleted (IPersistFile::SaveCompleted) -// // Summary: Determines whether a file save is completed -// // Arguments: pszFileName // [in] Pointer to zero-terminated string of // absolute path where file was previously saved -// // Returns: S_OK // Always -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/) { @@ -720,20 +632,13 @@ SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/) } //M------------------------------------------------------------------------- -// // Method: COooFilter::Load (IPersistStream::Load) -// // Summary: Initializes an object from the stream where it was previously saved -// // Arguments: pStm // [in] Pointer to stream from which object should be loaded -// -// // Returns: S_OK // E_OUTOFMEMORY // E_FAIL -// -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm) { @@ -759,56 +664,37 @@ SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm) } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetSizeMax (IPersistStream::GetSizeMax) -// // Summary: Returns the size in bytes of the stream neede to save the object. -// // Arguments: pcbSize // [out] Pointer to a 64 bit unsigned int indicating the size needed -// // Returns: E_NOTIMPL -// -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/) { - // return E_NOTIMPL; } //M------------------------------------------------------------------------- -// // Method: COooFilter::Save (IPersistStream::Save) -// // Summary: Save object to specified stream -// // Arguments: pStm // [in] Pointer to stream -// // fClearDirty // [in] Indicates whether to clear dirty flag -// // Returns: E_NOTIMPL -// -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL ) { - // return E_NOTIMPL; } //M------------------------------------------------------------------------- -// // Method: COooFilter::GetCurFile (IPersistFile::GetCurFile) -// // Summary: Returns a copy of the current file name -// // Arguments: ppszFileName // [out] Address to receive pointer to zero-terminated // string for absolute path to current file -// // Returns: S_OK // A valid absolute path was successfully returned // S_FALSE @@ -818,7 +704,6 @@ SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL ) // E_FAIL // Operation failed due to some reason // other than insufficient memory -// //------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilter::GetCurFile(LPWSTR * ppszFileName) { @@ -830,15 +715,10 @@ SCODE STDMETHODCALLTYPE COooFilter::GetCurFile(LPWSTR * ppszFileName) } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::COooFilterCF -// // Summary: Class factory constructor -// // Arguments: void -// // Purpose: Manages global instance count -// //-------------------------------------------------------------------------- COooFilterCF::COooFilterCF() : m_lRefs(1) @@ -846,36 +726,26 @@ COooFilterCF::COooFilterCF() : InterlockedIncrement( &g_lInstances ); } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::~COooFilterCF -// // Summary: Class factory destructor -// // Arguments: void -// // Purpose: Manages global instance count -// //-------------------------------------------------------------------------- COooFilterCF::~COooFilterCF() { InterlockedDecrement( &g_lInstances ); } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::QueryInterface (IUnknown::QueryInterface) -// // Summary: Queries for requested interface -// // Arguments: riid // [in] Reference IID of requested interface // ppvObject // [out] Address that receives requested interface pointer -// // Returns: S_OK // Interface is supported // E_NOINTERFACE // Interface is not supported -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilterCF::QueryInterface(REFIID riid, void ** ppvObject) { @@ -895,30 +765,20 @@ SCODE STDMETHODCALLTYPE COooFilterCF::QueryInterface(REFIID riid, void ** ppvOb return S_OK; } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::AddRef (IUknown::AddRef) -// // Summary: Increments interface refcount -// // Arguments: void -// // Returns: Value of incremented interface refcount -// //------------------------------------------------------------------------- ULONG STDMETHODCALLTYPE COooFilterCF::AddRef() { return InterlockedIncrement( &m_lRefs ); } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::Release (IUnknown::Release) -// // Summary: Decrements interface refcount, deleting if unreferenced -// // Arguments: void -// // Returns: Value of decremented refcount -// //-------------------------------------------------------------------------- ULONG STDMETHODCALLTYPE COooFilterCF::Release() { @@ -929,18 +789,14 @@ ULONG STDMETHODCALLTYPE COooFilterCF::Release() return ulTmp; } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::CreateInstance (IClassFactory::CreateInstance) -// // Summary: Creates new OpenOffice.org filter object -// // Arguments: pUnkOuter // [in] Pointer to IUnknown interface of aggregating object // riid // [in] Reference IID of requested interface // ppvObject // [out] Address that receives requested interface pointer -// // Returns: S_OK // OpenOffice.org filter object was successfully created // CLASS_E_NOAGGREGATION @@ -952,7 +808,6 @@ ULONG STDMETHODCALLTYPE COooFilterCF::Release() // due to insufficient memory // E_UNEXPECTED // Unsuccessful due to an unexpected condition -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance( IUnknown * pUnkOuter, @@ -982,14 +837,10 @@ SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance( } //M------------------------------------------------------------------------- -// // Method: COooFilterCF::LockServer (IClassFactory::LockServer) -// // Summary: Forces/allows filter class to remain loaded/be unloaded -// // Arguments: fLock // [in] TRUE to lock, FALSE to unlock -// // Returns: S_OK // Always // E_FAIL @@ -998,7 +849,6 @@ SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance( // (not implemented) // E_UNEXPECTED // (not implemented) -// //-------------------------------------------------------------------------- SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock) { @@ -1009,28 +859,20 @@ SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock) return S_OK; } //+------------------------------------------------------------------------- -// // DLL: ooofilt.dll -// // Summary: Implements Dynamic Link Library functions for OpenOffice.org filter -// //-------------------------------------------------------------------------- //F------------------------------------------------------------------------- -// // Function: DllMain -// // Summary: Called from C-Runtime on process/thread attach/detach -// // Arguments: hInstance // [in] Handle to the DLL // fdwReason // [in] Reason for calling DLL entry point // lpReserve // [in] Details of DLL initialization and cleanup -// // Returns: TRUE // Always -// //-------------------------------------------------------------------------- extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, @@ -1043,18 +885,14 @@ extern "C" BOOL WINAPI DllMain( return TRUE; } //F------------------------------------------------------------------------- -// // Function: DllGetClassObject -// // Summary: Create OpenOffice.org filter class factory object -// // Arguments: cid // [in] Class ID of class that class factory creates // iid // [in] Reference IID of requested class factory interface // ppvObj // [out] Address that receives requested interface pointer -// // Returns: S_OK // Class factory object was created successfully // CLASS_E_CLASSNOTAVAILABLE @@ -1065,7 +903,6 @@ extern "C" BOOL WINAPI DllMain( // Insufficient memory to create the class factory object // E_UNEXPECTED // Unsuccessful due to an unexpected condition -// //------------------------------------------------------------------------- extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject( REFCLSID cid, @@ -1095,18 +932,13 @@ extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject( return S_OK; } //F------------------------------------------------------------------------- -// // Function: DllCanUnloadNow -// // Summary: Indicates whether it is possible to unload DLL -// // Arguments: void -// // Returns: S_OK // DLL can be unloaded now // S_FALSE // DLL must remain loaded -// //-------------------------------------------------------------------------- extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow() { @@ -1116,12 +948,9 @@ extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow() return S_FALSE; } //F------------------------------------------------------------------------- -// // Function: DllRegisterServer // DllUnregisterServer -// // Summary: Registers and unregisters DLL server -// // Returns: DllRegisterServer // S_OK // Registration was successful @@ -1147,14 +976,11 @@ extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow() // (not implemented) // E_UNEXPECTED // (not implemented) -// //-------------------------------------------------------------------------- //F------------------------------------------------------------------------- -// // helper functions to register the Indexing Service. -// //-------------------------------------------------------------------------- namespace /* private */ @@ -1427,66 +1253,13 @@ namespace /* private */ STDAPI DllRegisterServer() { - /* - TCHAR ModuleFileName[MAX_PATH]; - - GetModuleFileName( - GetModuleHandle(MODULE_NAME_FILTER), - ModuleFileName, - sizeof(ModuleFileName)); - - HRESULT hr = S_OK; - - -// register search handler -#ifdef UNICODE - if (FAILED(RegisterSearchHandler(WStringToString(ModuleFileName).c_str()))) - hr = E_FAIL; - if (FAILED(AddOrRemoveDllsToRegisterList(WStringToString(ModuleFileName).c_str(), true))) - hr = E_FAIL; -#else - if (FAILED(RegisterSearchHandler(ModuleFileName))) - hr = E_FAIL; - if (FAILED(AddOrRemoveDllsToRegisterList(ModuleFileName, true))) - hr = E_FAIL; -#endif - - - return hr; - */ return S_OK; } //--------------------------- -// -//--------------------------- STDAPI DllUnregisterServer() { - /* - TCHAR ModuleFileName[MAX_PATH]; - - GetModuleFileName( - GetModuleHandle(MODULE_NAME_FILTER), - ModuleFileName, - sizeof(ModuleFileName)); - - HRESULT hr = S_OK; - - // unregister search handler - if (FAILED(UnregisterSearchHandler())) - hr = E_FAIL; - -#ifdef UNICODE - if (FAILED(AddOrRemoveDllsToRegisterList(WStringToString(ModuleFileName).c_str(),false))) - hr = E_FAIL; -#else - if (FAILED(AddOrRemoveDllsToRegisterList(ModuleFileName, false))) - hr = E_FAIL; -#endif - - return hr; - */ return S_OK; } diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx index bc637a3be577..030a3e5d99ca 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx @@ -29,39 +29,29 @@ #include "internal/types.hxx" //+------------------------------------------------------------------------- -// // Contents: OpenOffice.org filter declarations -// // Platform: Windows 2000, Windows XP -// //-------------------------------------------------------------------------- #pragma once //+------------------------------------------------------------------------- -// // forward declaration -// //-------------------------------------------------------------------------- class CContentReader; class CMetaInfoReader; class CFullPropSpec; //+------------------------------------------------------------------------- -// // Global definitions -// //-------------------------------------------------------------------------- long g_lInstances = 0; // Global count of COooFilter and COooFilterCF instances GUID const guidStorage = PSGUID_STORAGE; // GUID for storage property set //C------------------------------------------------------------------------- -// // Class: COooFilter -// // Purpose: Implements interfaces of OpenOffice.org filter -// //-------------------------------------------------------------------------- // OooFilter Class ID @@ -180,11 +170,8 @@ private: }; //C------------------------------------------------------------------------- -// // Class: COooFilterCF -// // Purpose: Implements class factory for OpenOffice.org filter -// //-------------------------------------------------------------------------- class COooFilterCF : public IClassFactory diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx index 33a2f1c42e60..24d4c22bc9ee 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx @@ -30,11 +30,8 @@ #include "precompiled_shell.hxx" //+------------------------------------------------------------------------- -// // File: propspec.cxx -// // Contents: C++ wrappers for FULLPROPSPEC -// //-------------------------------------------------------------------------- #if defined _MSC_VER #pragma warning(push, 1) @@ -50,12 +47,8 @@ #include "propspec.hxx" -//GUID CLSID_Storage = PSGUID_STORAGE; -// -// //refer to ms-help://MS.VSCC/MS.MSDNVS.2052/com/stgasstg_7agk.htm //FMTID_SummaryInformation -// //GUID CLSID_SummaryInforation = { // 0xF29F85E0, // 0x4FF9, @@ -63,13 +56,9 @@ // { 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9 } //}; //+------------------------------------------------------------------------- -// // Member: CFullPropSpec::CFullPropSpec, public -// // Synopsis: Default constructor -// // Effects: Defines property with null guid and propid 0 -// //-------------------------------------------------------------------------- CFullPropSpec::CFullPropSpec() @@ -79,14 +68,10 @@ CFullPropSpec::CFullPropSpec() _psProperty.propid = 0; } //+------------------------------------------------------------------------- -// // Member: CFullPropSpec::CFullPropSpec, public -// // Synopsis: Construct propid based propspec -// // Arguments: [guidPropSet] -- Property set // [pidProperty] -- Property -// //-------------------------------------------------------------------------- CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, PROPID pidProperty ) : _guidPropSet( guidPropSet ) @@ -95,14 +80,10 @@ CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, PROPID pidProperty ) : _psProperty.propid = pidProperty; } //+------------------------------------------------------------------------- -// // Member: CFullPropSpec::CFullPropSpec, public -// // Synopsis: Construct name based propspec -// // Arguments: [guidPropSet] -- Property set // [wcsProperty] -- Property -// //-------------------------------------------------------------------------- CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, WCHAR const * wcsProperty ) : @@ -112,13 +93,9 @@ CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, SetProperty( wcsProperty ); } //+------------------------------------------------------------------------- -// // Member: CFullPropSpec::CFullPropSpec, public -// // Synopsis: Copy constructor -// // Arguments: [src] -- Source property spec -// //-------------------------------------------------------------------------- CFullPropSpec::CFullPropSpec( CFullPropSpec const & src ) : _guidPropSet( src._guidPropSet ) @@ -144,13 +121,9 @@ inline void * operator new( size_t /*size*/, void * p ) return( p ); } //+------------------------------------------------------------------------- -// // Member: CFullPropSpec::operator=, public -// // Synopsis: Assignment operator -// // Arguments: [Property] -- Source property -// //-------------------------------------------------------------------------- CFullPropSpec & CFullPropSpec::operator=( CFullPropSpec const & Property ) { diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx index bfe6f8becab1..1c8a92b9f617 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx @@ -26,11 +26,8 @@ * ************************************************************************/ //+------------------------------------------------------------------------- -// // File: propspec.hxx -// // Contents: C++ wrapper(s) for FULLPROPSPEC -// //------------------------------------------------------------------------- #pragma once #if defined _MSC_VER @@ -43,30 +40,14 @@ #pragma warning(pop) #endif //+------------------------------------------------------------------------- -// // Declare: CLSID_SummaryInforation, GUID // CLSID_Storage, GUID -// // Contents: Definitions of OpenOffice.org Document properties -// //-------------------------------------------------------------------------- -//extern GUID CLSID_Storage; -// -//extern GUID CLSID_SummaryInformation; -//const PID_TITLE = PIDSI_TITLE; // 2; -//const PID_SUBJECT = PIDSI_SUBJECT; // 3; -//const PID_AUTHOR = PIDSI_AUTHOR; // 4; -//const PID_KEYWORDS = PIDSI_KEYWORDS; // 5; -//const PID_COMMENTS = PIDSI_COMMENTS; //6; -//const PID_REVNUMBER = PIDSI_REVNUMBER; //9; -//const PID_WORDCOUNT = PIDSI_WORDCOUNT; //f; //+------------------------------------------------------------------------- -// // Class: CFullPropertySpec -// // Purpose: Describes full (PropertySet\Property) name of a property. -// //-------------------------------------------------------------------------- class CFullPropSpec diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx index 9542eae8e381..729e8ba814ee 100644 --- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx @@ -39,19 +39,6 @@ #include <stdio.h> #include <objidl.h> - -/*#include <string.h> -#include <filter.h> -#include <filterr.h> -#include <ntquery.h> -#include "assert.h" -#include "propspec.hxx" -#ifdef __MINGW32__ -#include <algorithm> -using ::std::min; -#endif -*/ - #include "internal/stream_helper.hxx" extern "C" { diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index dc8d8e4585fa..491ed2170136 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -50,9 +50,7 @@ long g_DllRefCnt = 0; HINSTANCE g_hModule = NULL; -// // Map of property keys to the locations of their value(s) in the .??? XML schema -// struct PROPERTYMAP { PROPERTYKEY key; @@ -72,8 +70,6 @@ PROPERTYMAP g_rgPROPERTYMAP[] = size_t gPropertyMapTableSize = SAL_N_ELEMENTS(g_rgPROPERTYMAP); //---------------------------- -// -//---------------------------- CPropertyHdl::CPropertyHdl( long nRefCnt ) : m_RefCnt( nRefCnt ), @@ -84,8 +80,6 @@ CPropertyHdl::CPropertyHdl( long nRefCnt ) : } //---------------------------- -// -//---------------------------- CPropertyHdl::~CPropertyHdl() { @@ -247,11 +241,6 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::Initialize( IStream *pStream, DWORD grfM OutputDebugStringFormat( "CPropertyHdl::Initialize: Caught exception [%s]", e.what() ); return E_FAIL; } -/* - // load extended properties and search content - _LoadExtendedProperties(); - _LoadSearchContent(); -*/ } return S_OK; diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx index 6f4587f85b3e..284f50850410 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx @@ -40,11 +40,9 @@ #include "internal/config.hxx" #include "internal/iso8601_converter.hxx" -//##################################### const bool READONLY = false; const bool WRITEABLE = true; -//##################################### document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor) { File_Type_t file_type = get_file_type(document_name); @@ -58,17 +56,14 @@ document_statistic_reader_ptr create_document_statistic_reader(const std::string } -//##################################### document_statistic_reader::document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor) : document_name_(document_name), meta_info_accessor_(meta_info_accessor) {} -//##################################### document_statistic_reader::~document_statistic_reader() {} -//##################################### void document_statistic_reader::read(statistic_group_list_t* group_list) { group_list->clear(); @@ -76,13 +71,11 @@ void document_statistic_reader::read(statistic_group_list_t* group_list) fill_origin_section(meta_info_accessor_, group_list); } -//##################################### std::string document_statistic_reader::get_document_name() const { return document_name_; } -//##################################### void document_statistic_reader::fill_origin_section(CMetaInfoReader *meta_info_accessor, statistic_group_list_t* group_list) { statistic_item_list_t il; @@ -100,12 +93,10 @@ void document_statistic_reader::fill_origin_section(CMetaInfoReader *meta_info_a group_list->push_back(statistic_group_t(GetResString(IDS_ORIGIN), il)); } -//##################################### writer_document_statistic_reader::writer_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor) : document_statistic_reader(document_name, meta_info_accessor) {} -//##################################### void writer_document_statistic_reader::fill_description_section(CMetaInfoReader *meta_info_accessor, statistic_group_list_t* group_list) { statistic_item_list_t il; @@ -125,13 +116,11 @@ void writer_document_statistic_reader::fill_description_section(CMetaInfoReader group_list->push_back(statistic_group_t(GetResString(IDS_DESCRIPTION), il)); } -//####################################### calc_document_statistic_reader::calc_document_statistic_reader( const std::string& document_name, CMetaInfoReader* meta_info_accessor) : document_statistic_reader(document_name, meta_info_accessor) {} -//####################################### void calc_document_statistic_reader::fill_description_section( CMetaInfoReader *meta_info_accessor,statistic_group_list_t* group_list) { @@ -148,13 +137,11 @@ void calc_document_statistic_reader::fill_description_section( group_list->push_back(statistic_group_t(GetResString(IDS_DESCRIPTION), il)); } -//####################################### draw_impress_math_document_statistic_reader::draw_impress_math_document_statistic_reader( const std::string& document_name, CMetaInfoReader* meta_info_accessor) : document_statistic_reader(document_name, meta_info_accessor) {} -//####################################### void draw_impress_math_document_statistic_reader::fill_description_section( CMetaInfoReader *meta_info_accessor, statistic_group_list_t* group_list) { diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx index ee884c94fe44..e15b62a0bc96 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx @@ -36,8 +36,6 @@ //------------------------------------ -// -//------------------------------------ struct statistic_item { @@ -58,16 +56,12 @@ struct statistic_item }; //------------------------------------ -// -//------------------------------------ typedef std::vector<statistic_item> statistic_item_list_t; typedef std::pair<std::wstring, statistic_item_list_t> statistic_group_t; typedef std::vector<statistic_group_t> statistic_group_list_t; //------------------------------------ -// -//------------------------------------ class document_statistic_reader; typedef std::auto_ptr<document_statistic_reader> document_statistic_reader_ptr; @@ -75,8 +69,6 @@ typedef std::auto_ptr<document_statistic_reader> document_statistic_reader_ptr; document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor); //------------------------------------ -// -//------------------------------------ class document_statistic_reader { @@ -103,8 +95,6 @@ private: }; //------------------------------------ -// -//------------------------------------ class writer_document_statistic_reader : public document_statistic_reader { @@ -118,8 +108,6 @@ protected: }; //------------------------------------ -// -//------------------------------------ class calc_document_statistic_reader : public document_statistic_reader { @@ -133,8 +121,6 @@ protected: }; //------------------------------------ -// -//------------------------------------ class draw_impress_math_document_statistic_reader : public document_statistic_reader { diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx index 9a2cedeb4e53..68a3b6903f3f 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx @@ -53,8 +53,6 @@ #include "internal/resource.h" //------------------------------------ -// -//------------------------------------ list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2) @@ -66,8 +64,6 @@ list_view_builder_ptr create_list_view_builder( } //------------------------------------ -// -//------------------------------------ list_view_builder::list_view_builder( HWND hwnd_list_view, @@ -81,16 +77,12 @@ list_view_builder::list_view_builder( } //------------------------------------ -// -//------------------------------------ list_view_builder::~list_view_builder() { } //------------------------------------ -// -//------------------------------------ void list_view_builder::build(statistic_group_list_t& gl) { @@ -113,8 +105,6 @@ void list_view_builder::build(statistic_group_list_t& gl) } //------------------------------------ -// -//------------------------------------ void list_view_builder::setup_list_view() { @@ -145,8 +135,6 @@ void list_view_builder::setup_list_view() } //------------------------------------ -// -//------------------------------------ void list_view_builder::insert_group(const std::wstring& /*title*/) { @@ -154,8 +142,6 @@ void list_view_builder::insert_group(const std::wstring& /*title*/) } //------------------------------------ -// -//------------------------------------ void list_view_builder::insert_item(const std::wstring& title, const std::wstring& value, bool is_editable) { @@ -189,8 +175,6 @@ void list_view_builder::insert_item(const std::wstring& title, const std::wstrin } //------------------------------------ -// -//------------------------------------ HWND list_view_builder::get_list_view() const { @@ -198,8 +182,6 @@ HWND list_view_builder::get_list_view() const } //------------------------------------ -// -//------------------------------------ winxp_list_view_builder::winxp_list_view_builder( HWND hwnd_list_view, @@ -212,8 +194,6 @@ winxp_list_view_builder::winxp_list_view_builder( } //------------------------------------ -// -//------------------------------------ void winxp_list_view_builder::setup_list_view() { @@ -223,8 +203,6 @@ void winxp_list_view_builder::setup_list_view() } //------------------------------------ -// -//------------------------------------ void winxp_list_view_builder::insert_group(const std::wstring& name) { @@ -244,8 +222,6 @@ void winxp_list_view_builder::insert_group(const std::wstring& name) } //------------------------------------ -// -//------------------------------------ void winxp_list_view_builder::insert_item( const std::wstring& title, const std::wstring& value, bool is_editable) diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx index a66747903329..20f9fc5ec18b 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx @@ -46,8 +46,6 @@ #include "document_statistic.hxx" //------------------------------------ -// -//------------------------------------ class list_view_builder; typedef std::auto_ptr<list_view_builder> list_view_builder_ptr; @@ -57,8 +55,6 @@ list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2); //------------------------------------ -// -//------------------------------------ class list_view_builder { @@ -91,8 +87,6 @@ private: }; //------------------------------------ -// -//------------------------------------ class winxp_list_view_builder : public list_view_builder { diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index 7cf38d4fe7b5..4c371cf70e2f 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -61,8 +61,6 @@ ----------------------------------------------*/ //----------------------------- -// -//----------------------------- CPropertySheet::CPropertySheet(long RefCnt) : m_RefCnt(RefCnt) @@ -72,8 +70,6 @@ CPropertySheet::CPropertySheet(long RefCnt) : } //----------------------------- -// -//----------------------------- CPropertySheet::~CPropertySheet() { @@ -110,8 +106,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface( } //----------------------------- -// -//----------------------------- ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void) { @@ -120,8 +114,6 @@ ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void) } //----------------------------- -// -//----------------------------- ULONG STDMETHODCALLTYPE CPropertySheet::Release(void) { @@ -259,8 +251,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddP } //----------------------------- -// -//----------------------------- HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( UINT /*uPageID*/, LPFNADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/) @@ -269,8 +259,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( } //----------------------------- -// -//----------------------------- UINT CALLBACK CPropertySheet::PropPageSummaryCallback( HWND /*hwnd*/, UINT uMsg, LPPROPSHEETPAGE ppsp) @@ -290,8 +278,6 @@ UINT CALLBACK CPropertySheet::PropPageSummaryCallback( //----------------------------- -// -//----------------------------- BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { @@ -310,8 +296,6 @@ BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM } //----------------------------- -// -//----------------------------- BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { @@ -329,7 +313,6 @@ BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPAR return FALSE; } -//################################## void CPropertySheet::InitPropPageSummary(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/) { try diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index a72c8e04b561..cd573e38f7cf 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -289,7 +289,6 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Clone(IStream **) { return E_NOTIMPL; } -//######################################### CThumbviewer::CThumbviewer(long RefCnt) : diff --git a/shell/source/win32/shlxthandler/util/dbgmacros.cxx b/shell/source/win32/shlxthandler/util/dbgmacros.cxx index c657335e5eeb..76a2d83f5b03 100644 --- a/shell/source/win32/shlxthandler/util/dbgmacros.cxx +++ b/shell/source/win32/shlxthandler/util/dbgmacros.cxx @@ -41,20 +41,6 @@ void DbgAssert(bool /*condition*/, const char* /*message*/) { - - //if (!condition) - //{ - // char msg[1024]; - // - // sprintf(msg, "Assertion in file %s at line %d\n%s", __FILE__, __LINE__, message); - - // int nRet = MessageBoxA( - // 0, - // msg, - // "Assertion violation", - // MB_ICONEXCLAMATION | MB_ABORTRETRYIGNORE); - //} - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx index 1e67bcf0e418..1093a96b826b 100644 --- a/shell/source/win32/shlxthandler/util/fileextensions.cxx +++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx @@ -33,8 +33,6 @@ #include <sal/macros.h> //------------------------------------ -// -//------------------------------------ const std::string WRITER_FILE_EXTENSIONS = "sxwstwsxgodtottodm"; const std::string CALC_FILE_EXTENSIONS = "sxcstcodsots"; diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx index 1fc6f52668cc..01a16db4ffa6 100644 --- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx +++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx @@ -46,7 +46,6 @@ std::wstring iso8601_date_to_local_date(const std::wstring& isoDate ) if ( ws8601DateTime.length() == 19 ) { - //fill in the SYSTEMTIME structure; std::string asDateTime = WStringToString( ws8601DateTime ); SYSTEMTIME DateTime; DateTime.wYear = ( unsigned short )strtol( asDateTime.substr( 0, 4 ).c_str(), NULL, 10 ); @@ -170,14 +169,6 @@ std::wstring iso8601_duration_to_local_duration(const std::wstring& iso8601durat return result; #undef ADD_AS_PREFILLED -/* -#else - std::wostringstream oss; - oss << std::setw(2) << std::setfill('0') << hours << L":" << - std::setw(2) << std::setfill('0') << minutes << L":" << - std::setw(2) << std::setfill('0') << seconds; - return oss.str(); -*/ #endif } diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index 4cf7184845a6..5bbd207791cc 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -49,15 +49,11 @@ #endif //--------------------------------------- -// -//--------------------------------------- // Size of a CLSID as a string const int CLSID_STRING_SIZE = 39; //--------------------------------------- -// -//--------------------------------------- bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, const char* Value) { @@ -79,8 +75,6 @@ bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, co } //--------------------------------------- -// -//--------------------------------------- bool DeleteRegistryKey(HKEY RootKey, const char* KeyName) { @@ -180,8 +174,6 @@ std::string ClsidToString(const CLSID& clsid) } //--------------------------------------- -// -//--------------------------------------- bool QueryRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, char *pszData, DWORD dwBufLen) { diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx index 278e4e29840b..06619a485f34 100644 --- a/shell/source/win32/shlxthandler/util/utilities.cxx +++ b/shell/source/win32/shlxthandler/util/utilities.cxx @@ -171,21 +171,6 @@ std::wstring getShortPathName( const std::wstring& aLongName ) return shortName; } -/** convert LocaleSet pair into Microsoft List of Locale ID (LCID) - according to ISO-639 and ISO-3166. - http://etext.lib.virginia.edu/tei/iso639.html - http://nl.ijs.si/gnusl/cee/std/ISO_3166.html - @param - Locale, LocaleSet - @returns - Windows Locale Identifier corresponding to input LocaleSet. - @Usage Sample - LocaleSet_t myDefaultLocale( ::std::wstring( L"zh" ),::std::wstring(L"HK") ); - DWORD myLCID = LocaleSetToLCID( myDefaultLocale ); - wchar_t buffer[20]; - _ultow( myLCID, buffer, 16 ); - MessageBox( NULL, buffer,L"the LCID is:",MB_OK ); -*/ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) { @@ -314,8 +299,6 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) else if ( wsLanguage == L"es" ) { usPrimaryLang = LANG_SPANISH; //Spanish - //else if ( wsCountry == L"ES" ) - // usSubLang = SUBLANG_SPANISH; // Spanish (Castilian) if ( wsCountry == L"MX" ) usSubLang = SUBLANG_SPANISH_MEXICAN; // Spanish (Mexican) else if ( wsCountry == L"ES" ) @@ -418,8 +401,6 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) usPrimaryLang = LANG_NORWEGIAN; //Norwegian if ( wsCountry == L"NO" ) usSubLang = SUBLANG_NORWEGIAN_BOKMAL; // Norwegian (Bokmal) - //else if ( wsCountry == L"NO" ) - // usSubLang = SUBLANG_NORWEGIAN_NYNORSK; // Norwegian (Nynorsk) else usSubLang = SUBLANG_DEFAULT; //default sub language } @@ -506,13 +487,7 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) else if ( wsLanguage == L"hy" ) usPrimaryLang = LANG_ARMENIAN; //Armenian else if ( wsLanguage == L"az" ) - { usPrimaryLang = LANG_AZERI; //Azeri - //if ( wsCountry == L" " ) - // usSubLang = SUBLANG_AZERI_LATIN; // Azeri (Latin) - //else if ( wsCountry == L" " ) - // usSubLang = SUBLANG_AZERI_CYRILLIC; // Azeri (Cyrillic) - } else if ( wsLanguage == L"eu" ) usPrimaryLang = LANG_BASQUE; //Basque else if ( wsLanguage == L"mk" ) @@ -585,14 +560,6 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale ) usPrimaryLang = LANG_KASHMIRI; //Not supported. else if ( wsLanguage == L"ne" ) usPrimaryLang = LANG_NEPALI; //Not supported. - //else if ( wsLanguage == L" " ) - // usPrimaryLang = LANG_MANIPURI; //Not supported. - //else if ( wsLanguage == L" " ) - // usPrimaryLang = LANG_KONKANI; //Konkani - //else if ( wsLanguage == L" " ) - // usPrimaryLang = LANG_SYRIAC; //Syriac - //else if ( wsLanguage == L" " ) - // usPrimaryLang = LANG_DIVEHI; //Divehi else return GetSystemDefaultLCID(); //System Default Locale diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index b1444dc30810..e4dd24dfb11b 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -264,7 +264,6 @@ void initParameter(int argc, char* argv[]) */ int main(int argc, char* argv[]) { - //MessageBox(NULL, "Debug", "Debug", MB_OK); initParameter(argc, argv); @@ -278,7 +277,7 @@ int main(int argc, char* argv[]) { CSimpleMapi mapi; - // #93007# we have to set the flag MAPI_NEW_SESSION, + // we have to set the flag MAPI_NEW_SESSION, // because in the case Outlook xxx (not Outlook Express!) // is installed as Exchange and Mail Client a Profile // selection dialog must appear because we specify no diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index e47a767c0aeb..52707b3cac19 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -271,7 +271,6 @@ void CSmplMailClient::validateParameter( static_cast<XSimpleMailClient*>(this), 1); - // #93077# OSL_ENSURE(!(aFlag & NO_LOGON_DIALOG), "Flag NO_LOGON_DIALOG has currently no effect"); // check the flags, the allowed range is 0 - (2^n - 1) diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 5acd36f50266..a87d4aeb3f3e 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -58,8 +58,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_REGKEY_NAME "/com.sun.star.system.SimpleSystemMail/UNO/SERVICES/com.sun.star.system.SimpleSystemMail" //----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- namespace { @@ -70,7 +68,7 @@ namespace } //----------------------------------------------------------------------- -// the 3 important functions which will be exported +// the 2 important functions which will be exported //----------------------------------------------------------------------- extern "C" diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx index 354485b38ef3..ad679d84e062 100644 --- a/shell/source/win32/simplemail/smplmailmsg.cxx +++ b/shell/source/win32/simplemail/smplmailmsg.cxx @@ -60,8 +60,6 @@ CSmplMailMsg::CSmplMailMsg( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) throw (RuntimeException) @@ -70,8 +68,6 @@ void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) } //------------------------------------------------ -// -//------------------------------------------------ ::rtl::OUString SAL_CALL CSmplMailMsg::getRecipient( ) throw (RuntimeException) @@ -80,8 +76,6 @@ void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient ) throw (RuntimeException) @@ -90,8 +84,6 @@ void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecip } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) throw (RuntimeException) @@ -100,8 +92,6 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient ) throw (RuntimeException) @@ -110,8 +100,6 @@ void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRec } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) throw (RuntimeException) @@ -120,8 +108,6 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) throw (RuntimeException) @@ -130,8 +116,6 @@ void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) } //------------------------------------------------ -// -//------------------------------------------------ OUString SAL_CALL CSmplMailMsg::getOriginator( ) throw (RuntimeException) @@ -140,8 +124,6 @@ OUString SAL_CALL CSmplMailMsg::getOriginator( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) throw (RuntimeException) @@ -150,8 +132,6 @@ void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) } //------------------------------------------------ -// -//------------------------------------------------ OUString SAL_CALL CSmplMailMsg::getSubject( ) throw (RuntimeException) @@ -160,8 +140,6 @@ OUString SAL_CALL CSmplMailMsg::getSubject( ) } //------------------------------------------------ -// -//------------------------------------------------ void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAttachement ) throw (IllegalArgumentException, RuntimeException) @@ -170,8 +148,6 @@ void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< ::rtl::OUString >& a } //------------------------------------------------ -// -//------------------------------------------------ Sequence< OUString > SAL_CALL CSmplMailMsg::getAttachement( ) throw (RuntimeException) diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx index 315a9ea49a39..237996bf2c08 100644 --- a/shell/source/win32/simplemail/smplmailmsg.hxx +++ b/shell/source/win32/simplemail/smplmailmsg.hxx @@ -50,8 +50,6 @@ public: CSmplMailMsg( ); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient ) throw (::com::sun::star::uno::RuntimeException); @@ -60,8 +58,6 @@ public: throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient ) throw (::com::sun::star::uno::RuntimeException); @@ -70,8 +66,6 @@ public: throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient ) throw (::com::sun::star::uno::RuntimeException); @@ -80,8 +74,6 @@ public: throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator ) throw (::com::sun::star::uno::RuntimeException); @@ -90,8 +82,6 @@ public: throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject ) throw (::com::sun::star::uno::RuntimeException); @@ -100,8 +90,6 @@ public: throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // - //------------------------------------------------ virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); |