diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
| commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
| tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /shell | |
| parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) | |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'shell')
37 files changed, 358 insertions, 358 deletions
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index de8eb29966e6..8cf9f4b9ee0f 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -200,7 +200,7 @@ static OUString xdg_user_dir_lookup (const char *type) } } -//------------------------------------------------------------------------------ + uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue ) { @@ -224,7 +224,7 @@ uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue ) return uno::Any(); } -//------------------------------------------------------------------------------ + static void splitFontName( GConfValue *pGconfValue, OUString &rName, sal_Int16 &rHeight) { @@ -242,7 +242,7 @@ static void splitFontName( GConfValue *pGconfValue, OUString &rName, sal_Int16 & rName = OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 ); } -//------------------------------------------------------------------------------ + uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfValue ) { @@ -371,7 +371,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal return uno::Any(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const ConfigurationValue &rValue ) { diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 2d38cd28dcd3..c008fc582975 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -203,26 +203,26 @@ static OUString ImplGetLocale(int category) #endif -// ------------------------------------------------------------------------------- + LocaleBackend::LocaleBackend() { } -//------------------------------------------------------------------------------ + LocaleBackend::~LocaleBackend(void) { } -//------------------------------------------------------------------------------ + LocaleBackend* LocaleBackend::createInstance() { return new LocaleBackend; } -// --------------------------------------------------------------------------------------- + OUString LocaleBackend::getLocale(void) { @@ -235,7 +235,7 @@ OUString LocaleBackend::getLocale(void) #endif } -//------------------------------------------------------------------------------ + OUString LocaleBackend::getUILocale(void) { @@ -248,7 +248,7 @@ OUString LocaleBackend::getUILocale(void) #endif } -// --------------------------------------------------------------------------------------- + OUString LocaleBackend::getSystemLocale(void) { @@ -259,7 +259,7 @@ OUString LocaleBackend::getSystemLocale(void) return getLocale(); #endif } -//------------------------------------------------------------------------------ + void LocaleBackend::setPropertyValue( OUString const &, css::uno::Any const &) @@ -300,7 +300,7 @@ css::uno::Any LocaleBackend::getPropertyValue( } } -//------------------------------------------------------------------------------ + OUString SAL_CALL LocaleBackend::getBackendName(void) { return OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ; diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index 4eaf340a10ea..22549779c02a 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -25,7 +25,7 @@ namespace uno = com::sun::star::uno ; -//------------------------------------------------------------------------------ + static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend( SAL_UNUSED_PARAMETER const uno::Reference<uno::XComponentContext>&){ @@ -33,7 +33,7 @@ static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend( return * LocaleBackend::createInstance(); } -//------------------------------------------------------------------------------ + static const cppu::ImplementationEntry kImplementations_entries[] = { @@ -48,7 +48,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = { NULL, NULL, NULL, NULL, NULL, 0 } } ; -//------------------------------------------------------------------------------ + extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory( const sal_Char *aImplementationName, @@ -62,6 +62,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory( kImplementations_entries) ; } -//------------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index 0e7ba99a2ab4..919441443ebf 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -26,7 +26,7 @@ namespace uno = com::sun::star::uno; -//------------------------------------------------------------------------------ + static uno::Reference<uno::XInterface> SAL_CALL createMacOSXBackend( const uno::Reference<uno::XComponentContext>&) @@ -34,7 +34,7 @@ static uno::Reference<uno::XInterface> SAL_CALL createMacOSXBackend( return * MacOSXBackend::createInstance(); } -//------------------------------------------------------------------------------ + static const cppu::ImplementationEntry kImplementations_entries[] = { @@ -49,7 +49,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = { 0, 0, 0, 0, 0, 0 } }; -//------------------------------------------------------------------------------ + extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { @@ -61,6 +61,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( con kImplementations_entries); } -//------------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 2feac4964849..1c6b4de581d6 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -56,9 +56,9 @@ typedef struct OUString Port; } ProxyEntry; -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + namespace // private { @@ -100,7 +100,7 @@ namespace // private } // end private namespace -//------------------------------------------------------------------------------ + WinInetBackend::WinInetBackend() { @@ -205,7 +205,7 @@ WinInetBackend::WinInetBackend() if( aProxyList.getLength() > 0 ) { - //------------------------------------------------- + // this implementation follows the algorithm // of the internet explorer // if there are type-dependent proxy settings @@ -220,7 +220,7 @@ WinInetBackend::WinInetBackend() // if there is no port specified for a type independent // server the ie uses the port of an http server if // there is one and it has a port - //------------------------------------------------- + ProxyEntry aTypeIndepProxy = FindProxyEntry( aProxyList, OUString()); ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, OUString( @@ -296,20 +296,20 @@ WinInetBackend::WinInetBackend() } } -//------------------------------------------------------------------------------ + WinInetBackend::~WinInetBackend(void) { } -//------------------------------------------------------------------------------ + WinInetBackend* WinInetBackend::createInstance() { return new WinInetBackend; } -// --------------------------------------------------------------------------------------- + void WinInetBackend::setPropertyValue( OUString const &, css::uno::Any const &) @@ -360,13 +360,13 @@ css::uno::Any WinInetBackend::getPropertyValue( } } -//------------------------------------------------------------------------------ + OUString SAL_CALL WinInetBackend::getBackendName(void) { return OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ; } -//------------------------------------------------------------------------------ + OUString SAL_CALL WinInetBackend::getImplementationName(void) throw (uno::RuntimeException) diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index bff57de1c2b3..8958ac1dc596 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -26,7 +26,7 @@ namespace uno = com::sun::star::uno ; -//------------------------------------------------------------------------------ + static uno::Reference<uno::XInterface> SAL_CALL createWinInetBackend( const uno::Reference<uno::XComponentContext>&){ @@ -34,7 +34,7 @@ static uno::Reference<uno::XInterface> SAL_CALL createWinInetBackend( return * WinInetBackend::createInstance(); } -//------------------------------------------------------------------------------ + static const cppu::ImplementationEntry kImplementations_entries[] = { @@ -49,7 +49,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = { NULL, NULL, NULL, NULL, NULL, 0 } } ; -//------------------------------------------------------------------------------ + extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, @@ -62,6 +62,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( kImplementations_entries) ; } -//------------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 4448d1d01692..33a343ca9989 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -22,9 +22,9 @@ #include <osl/diagnose.h> #include "cmdmailsuppl.hxx" -//----------------------------------------------------------------------- + // namespace directives -//----------------------------------------------------------------------- + using namespace ::rtl ; using namespace ::com::sun::star::uno ; @@ -37,7 +37,7 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_SERVICE_NAME "com.sun.star.system.SimpleCommandMail" #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail" -//----------------------------------------------------------------------- + namespace { @@ -49,9 +49,9 @@ namespace extern "C" { -//---------------------------------------------------------------------- + // component_getFactory -//---------------------------------------------------------------------- + SAL_DLLPUBLIC_EXPORT void* SAL_CALL cmdmail_component_getFactory( const sal_Char* pImplName, diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 7f4059478e71..e0a6eaeb8d20 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -40,9 +40,9 @@ #include <errno.h> #include <unistd.h> -//------------------------------------------------------------------------ + // namespace directives -//------------------------------------------------------------------------ + using com::sun::star::beans::PropertyValue; using com::sun::star::system::XSimpleMailClientSupplier; @@ -62,9 +62,9 @@ using namespace com::sun::star::configuration; #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail2" -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + namespace // private { @@ -77,7 +77,7 @@ namespace // private } // end private namespace -//------------------------------------------------- + CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) : WeakImplHelper3< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo >() @@ -85,9 +85,9 @@ CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) : m_xConfigurationProvider = theDefaultProvider::get(xContext); } -//------------------------------------------------- + // XSimpleMailClientSupplier -//------------------------------------------------- + Reference< XSimpleMailClient > SAL_CALL CmdMailSuppl::querySimpleMailClient( ) throw (RuntimeException) @@ -95,9 +95,9 @@ Reference< XSimpleMailClient > SAL_CALL CmdMailSuppl::querySimpleMailClient( ) return static_cast < XSimpleMailClient * > (this); } -//------------------------------------------------ + // XSimpleMailClient -//------------------------------------------------ + Reference< XSimpleMailMessage > SAL_CALL CmdMailSuppl::createSimpleMailMessage( ) throw (::com::sun::star::uno::RuntimeException) @@ -105,9 +105,9 @@ Reference< XSimpleMailMessage > SAL_CALL CmdMailSuppl::createSimpleMailMessage( return Reference< XSimpleMailMessage >( new CmdMailMsg( ) ); } -//------------------------------------------------ + // XSimpleMailClient -//------------------------------------------------ + namespace { diff --git a/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx index 770f49fa5e37..ba6bed4c3140 100644 --- a/shell/source/tools/lngconvex/cmdline.cxx +++ b/shell/source/tools/lngconvex/cmdline.cxx @@ -22,7 +22,7 @@ #include <osl/diagnose.h> #include "cmdline.hxx" -//--------------------------------- + /** Simple command line abstraction */ diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 972957bba73b..41af7b2059b6 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -41,9 +41,9 @@ #include <errno.h> #include <unistd.h> -//------------------------------------------------------------------------ + // namespace directives -//------------------------------------------------------------------------ + using com::sun::star::system::XSystemShellExecute; using com::sun::star::system::SystemShellExecuteException; @@ -57,9 +57,9 @@ using namespace cppu; #define SHELLEXEC_IMPL_NAME "com.sun.star.comp.system.SystemShellExecute2" -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + namespace // private { @@ -85,7 +85,7 @@ void escapeForShell( OStringBuffer & rBuffer, const OString & rURL) } } -//----------------------------------------------------------------------------------------- + ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : WeakImplHelper2< XSystemShellExecute, XServiceInfo >(), @@ -109,7 +109,7 @@ 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 13b10ac268f8..45f47a0c3684 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -21,9 +21,9 @@ #include <osl/diagnose.h> #include "shellexec.hxx" -//----------------------------------------------------------------------- + // namespace directives -//----------------------------------------------------------------------- + using namespace ::rtl; using namespace ::com::sun::star::uno; @@ -35,7 +35,7 @@ using com::sun::star::system::XSystemShellExecute; #define SHELLEXEC_SERVICE_NAME "com.sun.star.system.SystemShellExecute" #define SHELLEXEC_IMPL_NAME "com.sun.star.comp.system.SystemShellExecute" -//----------------------------------------------------------------------- + namespace { @@ -47,9 +47,9 @@ namespace extern "C" { -//---------------------------------------------------------------------- + // component_getFactory -//---------------------------------------------------------------------- + SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, diff --git a/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx index 5a85dbe18dfa..1a48b180d54a 100644 --- a/shell/source/unix/exec/urltest.cxx +++ b/shell/source/unix/exec/urltest.cxx @@ -26,7 +26,7 @@ #include <string.h> #include <strings.h> -// ----------------------------------------------------------------------- + int main(int argc, const char *argv[]) { diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx index b1a71b795ab4..2bce26c8b972 100644 --- a/shell/source/unix/sysshell/recently_used_file.cxx +++ b/shell/source/unix/sysshell/recently_used_file.cxx @@ -44,7 +44,7 @@ inline void ensure_final_slash(/*inout*/ OUString& path) } // namespace private -//------------------------------------------------ + recently_used_file::recently_used_file() : file_(NULL) { @@ -85,7 +85,7 @@ recently_used_file::recently_used_file() : throw "Cannot determine user home directory"; } -//------------------------------------------------ + recently_used_file::~recently_used_file() { int ret = lockf(fileno(file_), F_ULOCK, 0); @@ -93,20 +93,20 @@ recently_used_file::~recently_used_file() fclose(file_); } -//------------------------------------------------ + void recently_used_file::reset() const { rewind(file_); } -//------------------------------------------------ + void recently_used_file::truncate(off_t length) { if (ftruncate(fileno(file_), length) == -1) throw "I/O error: ftruncate failed"; } -//------------------------------------------------ + size_t recently_used_file::read(char* buffer, size_t size) const { size_t r = fread(reinterpret_cast<void*>(buffer), sizeof(char), size, file_); @@ -117,14 +117,14 @@ size_t recently_used_file::read(char* buffer, size_t size) const return r; } -//---------------------------- + void recently_used_file::write(const char* buffer, size_t size) const { if (size != fwrite(reinterpret_cast<const void*>(buffer), sizeof(char), size, file_)) throw "I/O error: write failed"; } -//---------------------------- + bool recently_used_file::eof() const { return feof(file_); diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index 54f9a52b0869..c6c02baeb82c 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -47,7 +47,7 @@ namespace /* private */ { #define TAG_GROUPS "Groups" #define TAG_GROUP "Group" - //------------------------------------------------ + // compare two string_t's case insensitive, may also be done // by specifying special traits for the string type but in this // case it's easier to do it this way @@ -58,7 +58,7 @@ namespace /* private */ { { return (0 == strcasecmp(s1.c_str(), s2.c_str())); } }; - //------------------------------------------------ + struct recently_used_item { recently_used_item() : @@ -282,7 +282,7 @@ namespace /* private */ { recently_used_file_filter& operator=(const recently_used_file_filter&); }; - //------------------------------------------------ + void read_recently_used_items( recently_used_file& file, recently_used_item_list_t& item_list) @@ -300,7 +300,7 @@ namespace /* private */ { } } - //------------------------------------------------ + // The file ~/.recently_used shall not contain more than 500 // entries (see www.freedesktop.org) const int MAX_RECENTLY_USED_ITEMS = 500; @@ -327,11 +327,11 @@ namespace /* private */ { int items_written_; }; - //------------------------------------------------ + const char* XML_HEADER = "<?xml version=\"1.0\"?>\n<RecentFiles>\n"; const char* XML_FOOTER = "</RecentFiles>"; - //------------------------------------------------ + // assumes that the list is ordered decreasing void write_recently_used_items( recently_used_file& file, @@ -353,14 +353,14 @@ namespace /* private */ { } } - //------------------------------------------------ + struct delete_recently_used_item { void operator() (const recently_used_item* item) const { delete item; } }; - //------------------------------------------------ + void recently_used_item_list_clear(recently_used_item_list_t& item_list) { std::for_each( @@ -370,7 +370,7 @@ namespace /* private */ { item_list.clear(); } - //------------------------------------------------ + class find_item_predicate { public: @@ -384,19 +384,19 @@ namespace /* private */ { string_t uri_; }; - //------------------------------------------------ + struct greater_recently_used_item { bool operator ()(const recently_used_item* lhs, const recently_used_item* rhs) const { return (lhs->timestamp_ > rhs->timestamp_); } }; - //------------------------------------------------ + const char* GROUP_OOO = "openoffice.org"; const char* GROUP_STAR_OFFICE = "staroffice"; const char* GROUP_STAR_SUITE = "starsuite"; - //------------------------------------------------ + void recently_used_item_list_add( recently_used_item_list_t& item_list, const OUString& file_url, const OUString& mime_type) { @@ -443,7 +443,7 @@ namespace /* private */ { greater_recently_used_item()); } - //------------------------------------------------ + struct cleanup_guard { cleanup_guard(recently_used_item_list_t& item_list) : diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 0d4d7793293e..efeb6cc7147f 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -37,9 +37,9 @@ #pragma warning(pop) #endif -//------------------------------------------------------------------------ + // namespace directives -//------------------------------------------------------------------------ + using com::sun::star::uno::Reference; using com::sun::star::uno::RuntimeException; @@ -57,9 +57,9 @@ using namespace cppu; #define SYSSHEXEC_IMPL_NAME "com.sun.star.sys.shell.SystemShellExecute" -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + namespace // private { @@ -170,7 +170,7 @@ namespace // private #define E_UNKNOWN_EXEC_ERROR -1 - //----------------------------------------- + bool is_system_path(const OUString& path_or_uri) { @@ -179,9 +179,9 @@ namespace // private return (rc == osl::FileBase::E_None); } - //----------------------------------------- + // trying to identify a jump mark - //----------------------------------------- + const OUString JUMP_MARK_HTM(".htm#"); const OUString JUMP_MARK_HTML(".html#"); @@ -199,7 +199,7 @@ namespace // private return (jmp_mark > -1); } - //----------------------------------------- + bool is_existing_file(const OUString& file_name) { @@ -219,9 +219,9 @@ namespace // private return exist; } - //------------------------------------------------- + // Jump marks in file urls are illegal. - //------------------------------------------------- + void remove_jump_mark(OUString* p_command) { @@ -240,7 +240,7 @@ namespace // private } // end namespace -//----------------------------------------------------------------------------------------- + CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext ) : WeakComponentImplHelper2< XSystemShellExecute, XServiceInfo >( m_aMutex ), @@ -257,7 +257,7 @@ CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext CoInitialize( NULL ); } -//------------------------------------------------- + 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 d37d83013eaf..7c8ea3387bf0 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -22,9 +22,9 @@ #include <osl/diagnose.h> #include "SysShExec.hxx" -//----------------------------------------------------------------------- + // namespace directives -//----------------------------------------------------------------------- + using namespace ::rtl ; using namespace ::com::sun::star::uno ; @@ -37,7 +37,7 @@ using com::sun::star::system::XSystemShellExecute; #define SYSSHEXEC_SERVICE_NAME "com.sun.star.system.SystemShellExecute" #define SYSSHEXEC_IMPL_NAME "com.sun.star.system.SystemShellExecute" -//----------------------------------------------------------------------- + namespace { @@ -49,10 +49,10 @@ namespace extern "C" { -//---------------------------------------------------------------------- + // component_getFactory // returns a factory to create XFilePicker-Services -//---------------------------------------------------------------------- + SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, uno_Interface*, uno_Interface* /*pRegistryKey*/ ) { diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx index 74866b631172..91860d81906e 100644 --- a/shell/source/win32/ooofilereader/basereader.cxx +++ b/shell/source/win32/ooofilereader/basereader.cxx @@ -36,26 +36,26 @@ m_ZipFile( DocumentName ) { } -//------------------------------ + CBaseReader::CBaseReader(StreamInterface * sw): m_ZipFile( sw ) { } -//------------------------------ + CBaseReader::~CBaseReader() { } -//------------------------------ + void CBaseReader::start_document() { } -//------------------------------ + void CBaseReader::end_document() { diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx index 8190f66d4fe3..7f4ecd717243 100644 --- a/shell/source/win32/ooofilereader/contentreader.cxx +++ b/shell/source/win32/ooofilereader/contentreader.cxx @@ -167,9 +167,9 @@ LocaleSet_t const & CContentReader::getLocale( const StyleName_t Style ) /*********************** event handler functions ***********************/ -//------------------------------ + // start_element occurs when a tag is start -//------------------------------ + void CContentReader::start_element( const std::wstring& /*raw_name*/, @@ -184,9 +184,9 @@ void CContentReader::start_element( } -//------------------------------ + // end_element occurs when a tag is closed -//------------------------------ + void CContentReader::end_element(const std::wstring& /*raw_name*/, const std::wstring& local_name) { @@ -213,9 +213,9 @@ void CContentReader::end_element(const std::wstring& /*raw_name*/, const std::ws } -//------------------------------ + // characters occurs when receiving characters -//------------------------------ + void CContentReader::characters( const std::wstring& character ) { diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx index 9edecc97a1b1..cc3fdd87545d 100644 --- a/shell/source/win32/ooofilereader/metainforeader.cxx +++ b/shell/source/win32/ooofilereader/metainforeader.cxx @@ -223,9 +223,9 @@ ITag* CMetaInfoReader::chooseTagReader( const std::wstring& tag_name, const XmlT } -//------------------------------ + // save the received content into structure. -//------------------------------ + void CMetaInfoReader::saveTagContent( const std::wstring& tag_name ) { ITag* pTagBuilder; @@ -250,9 +250,9 @@ void CMetaInfoReader::saveTagContent( const std::wstring& tag_name ) /*********************** event handler functions ***********************/ -//------------------------------ + // start_element occurs when a tag is start -//------------------------------ + void CMetaInfoReader::start_element( const std::wstring& /*raw_name*/, @@ -267,9 +267,9 @@ void CMetaInfoReader::start_element( } -//------------------------------ + // end_element occurs when a tag is closed -//------------------------------ + void CMetaInfoReader::end_element(const std::wstring& /*raw_name*/, const std::wstring& local_name) { @@ -282,9 +282,9 @@ void CMetaInfoReader::end_element(const std::wstring& /*raw_name*/, const std::w } -//------------------------------ + // characters occurs when receiving characters -//------------------------------ + void CMetaInfoReader::characters( const std::wstring& character ) { diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index 018333b154ed..2c223113be37 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -35,11 +35,11 @@ using ::std::min; #include "internal/thumbviewer.hxx" #include "internal/shlxthdl.hxx" -//----------------------------- + long CClassFactory::s_ServerLocks = 0; -//----------------------------- + CClassFactory::CClassFactory(const CLSID& clsid) : m_RefCnt(1), @@ -48,16 +48,16 @@ CClassFactory::CClassFactory(const CLSID& clsid) : InterlockedIncrement(&g_DllRefCnt); } -//----------------------------- + CClassFactory::~CClassFactory() { InterlockedDecrement(&g_DllRefCnt); } -//----------------------------- + // IUnknown methods -//----------------------------- + HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) { @@ -74,14 +74,14 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_ return E_NOINTERFACE; } -//----------------------------- + ULONG STDMETHODCALLTYPE CClassFactory::AddRef(void) { return InterlockedIncrement(&m_RefCnt); } -//----------------------------- + ULONG STDMETHODCALLTYPE CClassFactory::Release(void) { @@ -93,9 +93,9 @@ ULONG STDMETHODCALLTYPE CClassFactory::Release(void) return refcnt; } -//----------------------------- + // IClassFactory methods -//----------------------------- + HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( IUnknown __RPC_FAR *pUnkOuter, @@ -132,7 +132,7 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( return hr; } -//----------------------------- + HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) { @@ -144,7 +144,7 @@ HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) return S_OK; } -//----------------------------- + bool CClassFactory::IsLocked() { diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index 9b276adeb393..6f4129e8f21f 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -31,7 +31,7 @@ #pragma GCC diagnostic warning "-Wmissing-braces" #endif -//---------------------------- + namespace /* private */ { @@ -48,7 +48,7 @@ namespace /* private */ size_t ColumnInfoTableSize = sizeof(ColumnInfoTable)/sizeof(ColumnInfoTable[0]); } -//---------------------------- + CColumnInfo::CColumnInfo(long RefCnt) : m_RefCnt(RefCnt) @@ -56,16 +56,16 @@ CColumnInfo::CColumnInfo(long RefCnt) : InterlockedIncrement(&g_DllRefCnt); } -//---------------------------- + CColumnInfo::~CColumnInfo() { InterlockedDecrement(&g_DllRefCnt); } -//----------------------------- + // IUnknown methods -//----------------------------- + HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) { @@ -82,14 +82,14 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FA return E_NOINTERFACE; } -//---------------------------- + ULONG STDMETHODCALLTYPE CColumnInfo::AddRef(void) { return InterlockedIncrement(&m_RefCnt); } -//---------------------------- + ULONG STDMETHODCALLTYPE CColumnInfo::Release( void) { @@ -101,18 +101,18 @@ ULONG STDMETHODCALLTYPE CColumnInfo::Release( void) return refcnt; } -//----------------------------- + // IColumnProvider -//----------------------------- + HRESULT STDMETHODCALLTYPE CColumnInfo::Initialize(LPCSHCOLUMNINIT /*psci*/) { return S_OK; } -//----------------------------- + // Register all columns we support -//----------------------------- + HRESULT STDMETHODCALLTYPE CColumnInfo::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci) { @@ -132,7 +132,7 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO return S_OK; } -//----------------------------- + HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData) { @@ -198,7 +198,7 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOL return S_FALSE; } -//----------------------------- + 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 9dbb6fe88911..29cb838d303e 100644 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -38,7 +38,7 @@ #define KB 1024.0 const std::wstring WSPACE = std::wstring(SPACE); -//----------------------------- + CInfoTip::CInfoTip(long RefCnt) : m_RefCnt(RefCnt) @@ -47,16 +47,16 @@ CInfoTip::CInfoTip(long RefCnt) : InterlockedIncrement(&g_DllRefCnt); } -//----------------------------- + CInfoTip::~CInfoTip() { InterlockedDecrement(&g_DllRefCnt); } -//----------------------------- + // IUnknown methods -//----------------------------- + HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) { @@ -82,14 +82,14 @@ HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR * return E_NOINTERFACE; } -//---------------------------- + ULONG STDMETHODCALLTYPE CInfoTip::AddRef(void) { return InterlockedIncrement(&m_RefCnt); } -//---------------------------- + ULONG STDMETHODCALLTYPE CInfoTip::Release( void) { @@ -191,9 +191,9 @@ std::wstring getFileSizeInfo(char* FileName) return EMPTY_STRING; } -//---------------------------- + // IQueryInfo methods -//---------------------------- + HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppwszTip) { @@ -300,16 +300,16 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws return E_FAIL; } -//---------------------------- + HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoFlags(DWORD * /*pdwFlags*/ ) { return E_NOTIMPL; } -//---------------------------- + // IPersist methods -//---------------------------- + HRESULT STDMETHODCALLTYPE CInfoTip::GetClassID(CLSID* pClassID) { @@ -317,9 +317,9 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetClassID(CLSID* pClassID) return S_OK; } -//---------------------------- + // IPersistFile methods -//---------------------------- + HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/) { @@ -345,28 +345,28 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ return S_OK; } -//---------------------------- + HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty(void) { return E_NOTIMPL; } -//---------------------------- + HRESULT STDMETHODCALLTYPE CInfoTip::Save(LPCOLESTR /*pszFileName*/, BOOL /*fRemember*/) { return E_NOTIMPL; } -//---------------------------- + HRESULT STDMETHODCALLTYPE CInfoTip::SaveCompleted(LPCOLESTR /*pszFileName*/) { return E_NOTIMPL; } -//---------------------------- + 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 c5a57f11eef7..7f26e1259137 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -18,7 +18,7 @@ */ -//-------------------------------------------------------------------------- + // File: ooofilt.cxx // Contents: Filter Implementation for OpenOffice.Org Document using // Indexing Service @@ -28,13 +28,13 @@ // to be filtered. // // Platform: Windows 2000, Windows XP -//-------------------------------------------------------------------------- + #include "internal/contentreader.hxx" #include "internal/metainforeader.hxx" #include "internal/registry.hxx" #include "internal/fileextensions.hxx" -//-------------------------------------------------------------------------- + // Include file Purpose // windows.h Win32 declarations // string.h string wstring declarations @@ -44,7 +44,7 @@ // assert.h assertion function. // ooofilt.hxx LibreOffice filter declarations // propspec.hxx PROPSPEC -//-------------------------------------------------------------------------- + #if defined _MSC_VER #pragma warning(push, 1) @@ -72,13 +72,13 @@ using ::std::min; //C------------------------------------------------------------------------- // Class: COooFilter // Summary: Implements LibreOffice filter class -//-------------------------------------------------------------------------- + //M------------------------------------------------------------------------- // Method: COooFilter::COooFilter // Summary: Class constructor // Arguments: void // Purpose: Manages global instance count -//-------------------------------------------------------------------------- + COooFilter::COooFilter() : m_lRefs(1), m_pContentReader(NULL), @@ -104,7 +104,7 @@ COooFilter::COooFilter() : // Summary: Class destructor // Arguments: void // Purpose: Manages global instance count and file handle -//-------------------------------------------------------------------------- + COooFilter::~COooFilter() { delete [] m_pAttributes; @@ -130,7 +130,7 @@ COooFilter::~COooFilter() // Interface is supported // E_NOINTERFACE // Interface is not supported -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::QueryInterface( REFIID riid, void ** ppvObject) @@ -160,7 +160,7 @@ SCODE STDMETHODCALLTYPE COooFilter::QueryInterface( // Summary: Increments interface refcount // Arguments: void // Returns: Value of incremented interface refcount -//-------------------------------------------------------------------------- + ULONG STDMETHODCALLTYPE COooFilter::AddRef() { return InterlockedIncrement( &m_lRefs ); @@ -170,7 +170,7 @@ ULONG STDMETHODCALLTYPE COooFilter::AddRef() // Summary: Decrements interface refcount, deleting if unreferenced // Arguments: void // Returns: Value of decremented interface refcount -//-------------------------------------------------------------------------- + ULONG STDMETHODCALLTYPE COooFilter::Release() { ULONG ulTmp = InterlockedDecrement( &m_lRefs ); @@ -200,7 +200,7 @@ ULONG STDMETHODCALLTYPE COooFilter::Release() // Unable to access file to be filtered // FILTER_E_PASSWORD // (not implemented) -//-------------------------------------------------------------------------- + const int COUNT_ATTRIBUTES = 5; SCODE STDMETHODCALLTYPE COooFilter::Init( @@ -310,7 +310,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Init( // (not implemented) // FILTER_E_PASSWORD // (not implemented) -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat) { for(;;) @@ -407,7 +407,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat) // 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) { switch ( m_eState ) @@ -446,7 +446,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffe // Arguments: ulPropID // [in] property ID // Returns: corresponding metainfo names. -//-------------------------------------------------------------------------- + ::std::wstring GetMetaInfoNameFromPropertyId( ULONG ulPropID ) { @@ -469,7 +469,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffe // Always // FILTER_E_NO_MORE_VALUES // (not implemented) -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::GetValue(PROPVARIANT ** ppPropValue) { @@ -515,7 +515,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetValue(PROPVARIANT ** ppPropValue) // Always // FILTER_W_REGION_CLIPPED // (not implemented) -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::BindRegion( FILTERREGION /*origPos*/, @@ -534,7 +534,7 @@ SCODE STDMETHODCALLTYPE COooFilter::BindRegion( // Always // E_FAIL // (not implemented) -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::GetClassID(CLSID * pClassID) { *pClassID = CLSID_COooFilter; @@ -548,7 +548,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetClassID(CLSID * pClassID) // Always // S_OK // (not implemented) -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::IsDirty() { // File is opened read-only and never changes @@ -568,7 +568,7 @@ SCODE STDMETHODCALLTYPE COooFilter::IsDirty() // File could not be loaded due to insufficient memory // E_FAIL // (not implemented) -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/) { // Load just sets the filename for GetChunk to read and ignores the mode @@ -603,7 +603,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/) // Always // S_OK // (not implemented) -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::Save(LPCWSTR /*pszFileName*/, BOOL /*fRemember*/) { // File is opened read-only; saving it is an error @@ -617,7 +617,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Save(LPCWSTR /*pszFileName*/, BOOL /*fRememb // absolute path where file was previously saved // Returns: S_OK // Always -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/) { // File is opened read-only, so "save" is always finished @@ -632,7 +632,7 @@ SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/) // Returns: S_OK // E_OUTOFMEMORY // E_FAIL -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm) { m_pStream = new BufferStream(pStm); @@ -659,7 +659,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm) // 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; @@ -673,7 +673,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/) // fClearDirty // [in] Indicates whether to clear dirty flag // Returns: E_NOTIMPL -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL ) { return E_NOTIMPL; @@ -694,7 +694,7 @@ 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) { if ( EMPTY_STRING == m_pwszFileName ) @@ -709,7 +709,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetCurFile(LPWSTR * ppszFileName) // Summary: Class factory constructor // Arguments: void // Purpose: Manages global instance count -//-------------------------------------------------------------------------- + COooFilterCF::COooFilterCF() : m_lRefs(1) { @@ -720,7 +720,7 @@ COooFilterCF::COooFilterCF() : // Summary: Class factory destructor // Arguments: void // Purpose: Manages global instance count -//-------------------------------------------------------------------------- + COooFilterCF::~COooFilterCF() { InterlockedDecrement( &g_lInstances ); @@ -736,7 +736,7 @@ COooFilterCF::~COooFilterCF() // Interface is supported // E_NOINTERFACE // Interface is not supported -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilterCF::QueryInterface(REFIID riid, void ** ppvObject) { IUnknown *pUnkTemp; @@ -759,7 +759,7 @@ SCODE STDMETHODCALLTYPE COooFilterCF::QueryInterface(REFIID riid, void ** ppvOb // Summary: Increments interface refcount // Arguments: void // Returns: Value of incremented interface refcount -//------------------------------------------------------------------------- + ULONG STDMETHODCALLTYPE COooFilterCF::AddRef() { return InterlockedIncrement( &m_lRefs ); @@ -769,7 +769,7 @@ ULONG STDMETHODCALLTYPE COooFilterCF::AddRef() // Summary: Decrements interface refcount, deleting if unreferenced // Arguments: void // Returns: Value of decremented refcount -//-------------------------------------------------------------------------- + ULONG STDMETHODCALLTYPE COooFilterCF::Release() { ULONG ulTmp = InterlockedDecrement( &m_lRefs ); @@ -798,7 +798,7 @@ ULONG STDMETHODCALLTYPE COooFilterCF::Release() // due to insufficient memory // E_UNEXPECTED // Unsuccessful due to an unexpected condition -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance( IUnknown * pUnkOuter, REFIID riid, @@ -834,7 +834,7 @@ SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance( // (not implemented) // E_UNEXPECTED // (not implemented) -//-------------------------------------------------------------------------- + SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock) { if( fLock ) @@ -846,7 +846,7 @@ SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock) //+------------------------------------------------------------------------- // DLL: ooofilt.dll // Summary: Implements Dynamic Link Library functions for LibreOffice filter -//-------------------------------------------------------------------------- + //F------------------------------------------------------------------------- // Function: DllMain // Summary: Called from C-Runtime on process/thread attach/detach @@ -858,7 +858,7 @@ SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock) // [in] Details of DLL initialization and cleanup // Returns: TRUE // Always -//-------------------------------------------------------------------------- + extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD fdwReason, @@ -888,7 +888,7 @@ 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, REFIID iid, @@ -923,7 +923,7 @@ extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject( // DLL can be unloaded now // S_FALSE // DLL must remain loaded -//-------------------------------------------------------------------------- + extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow() { if ( 0 >= g_lInstances ) @@ -960,12 +960,12 @@ extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow() // (not implemented) // E_UNEXPECTED // (not implemented) -//-------------------------------------------------------------------------- + //F------------------------------------------------------------------------- // helper functions to register the Indexing Service. -//-------------------------------------------------------------------------- + namespace /* private */ { @@ -981,10 +981,10 @@ namespace /* private */ const char* INDEXING_FILTER_DLLSTOREGISTER = "SYSTEM\\CurrentControlSet\\Control\\ContentIndex"; - //--------------------------- + // "String Placeholder" -> // "String Replacement" - //--------------------------- + void SubstitutePlaceholder(std::string& String, const std::string& Placeholder, const std::string& Replacement) { @@ -998,12 +998,12 @@ namespace /* private */ } } - //---------------------------------------------- + // Make the registry entry and set Filter Handler // HKCR\CLSID\{7BC0E710-5703-45be-A29D-5D46D8B39262} = LibreOffice Filter // InProcServer32 (Default) = Path\ooofilt.dll // ThreadingModel = Both - //---------------------------------------------- + HRESULT RegisterFilterHandler(const char* FilePath, const CLSID& FilterGuid) { @@ -1025,12 +1025,12 @@ namespace /* private */ return S_OK; } - //---------------------------------------------- + // Make the registry entry and set Persistent Handler // HKCR\CLSID\{7BC0E713-5703-45be-A29D-5D46D8B39262} = LibreOffice Persistent Handler // PersistentAddinsRegistered // {89BCB740-6119-101A-BCB7-00DD010655AF} = {7BC0E710-5703-45be-A29D-5D46D8B39262} - //---------------------------------------------- + HRESULT RegisterPersistentHandler(const CLSID& FilterGuid, const CLSID& PersistentGuid) { @@ -1064,9 +1064,9 @@ namespace /* private */ return S_OK; } - //--------------------------- + // Unregister Filter Handler or persistent handler - //--------------------------- + HRESULT UnregisterHandler(const CLSID& Guid) { @@ -1075,11 +1075,11 @@ namespace /* private */ return DeleteRegistryKey(HKEY_CLASSES_ROOT, tmp.c_str()) ? S_OK : E_FAIL; } - //--------------------------- + // Register Indexing Service ext and class. // HKCR\{EXT}\PersistentHandler = {7BC0E713-5703-45be-A29D-5D46D8B39262} // HKCR\{GUID\PersistentHandler = {7BC0E713-5703-45be-A29D-5D46D8B39262} - //--------------------------- + HRESULT RegisterSearchHandler(const char* ModuleFileName) { @@ -1164,11 +1164,11 @@ namespace /* private */ return ((UnregisterHandler(CLSID_FILTER_HANDLER)==S_OK) && (UnregisterHandler(CLSID_PERSISTENT_HANDLER)==S_OK))?S_OK:E_FAIL; } - //--------------------------- + // add or remove an entry to DllsToRegister entry of Indexing // Filter to let Indexing Service register our filter automatically // each time. - //--------------------------- + HRESULT AddOrRemoveDllsToRegisterList( const ::std::string & DllPath, bool isAdd ) { char DllsToRegisterList[4096]; @@ -1240,7 +1240,7 @@ STDAPI DllRegisterServer() return S_OK; } -//--------------------------- + STDAPI DllUnregisterServer() { diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx index ae0859f004e0..233cf86dca76 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx @@ -21,7 +21,7 @@ //+------------------------------------------------------------------------- // File: propspec.cxx // Contents: C++ wrappers for FULLPROPSPEC -//-------------------------------------------------------------------------- + #if defined _MSC_VER #pragma warning(push, 1) #endif @@ -48,7 +48,7 @@ // Member: CFullPropSpec::CFullPropSpec, public // Synopsis: Default constructor // Effects: Defines property with null guid and propid 0 -//-------------------------------------------------------------------------- + CFullPropSpec::CFullPropSpec() { @@ -61,7 +61,7 @@ CFullPropSpec::CFullPropSpec() // Synopsis: Construct propid based propspec // Arguments: [guidPropSet] -- Property set // [pidProperty] -- Property -//-------------------------------------------------------------------------- + CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, PROPID pidProperty ) : _guidPropSet( guidPropSet ) { @@ -73,7 +73,7 @@ CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, PROPID pidProperty ) : // Synopsis: Construct name based propspec // Arguments: [guidPropSet] -- Property set // [wcsProperty] -- Property -//-------------------------------------------------------------------------- + CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, WCHAR const * wcsProperty ) : _guidPropSet( guidPropSet ) @@ -85,7 +85,7 @@ CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, // Member: CFullPropSpec::CFullPropSpec, public // Synopsis: Copy constructor // Arguments: [src] -- Source property spec -//-------------------------------------------------------------------------- + CFullPropSpec::CFullPropSpec( CFullPropSpec const & src ) : _guidPropSet( src._guidPropSet ) { @@ -113,7 +113,7 @@ inline void * operator new( size_t /*size*/, void * p ) // Member: CFullPropSpec::operator=, public // Synopsis: Assignment operator // Arguments: [Property] -- Source property -//-------------------------------------------------------------------------- + CFullPropSpec & CFullPropSpec::operator=( CFullPropSpec const & Property ) { // Clean up. diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index a961c9da777a..8d25aef23749 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -38,9 +38,9 @@ #include "internal/stream_helper.hxx" -//--------------------------- + // Module global -//--------------------------- + long g_DllRefCnt = 0; HINSTANCE g_hModule = NULL; @@ -63,7 +63,7 @@ PROPERTYMAP g_rgPROPERTYMAP[] = size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]); -//---------------------------- + CPropertyHdl::CPropertyHdl( long nRefCnt ) : m_RefCnt( nRefCnt ), @@ -73,7 +73,7 @@ CPropertyHdl::CPropertyHdl( long nRefCnt ) : InterlockedIncrement( &g_DllRefCnt ); } -//---------------------------- + CPropertyHdl::~CPropertyHdl() { @@ -85,9 +85,9 @@ CPropertyHdl::~CPropertyHdl() InterlockedDecrement( &g_DllRefCnt ); } -//----------------------------- + // IUnknown methods -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertyHdl::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) { *ppvObject = 0; @@ -121,13 +121,13 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::QueryInterface(REFIID riid, void __RPC_F return E_NOINTERFACE; } -//---------------------------- + ULONG STDMETHODCALLTYPE CPropertyHdl::AddRef( void ) { return InterlockedIncrement( &m_RefCnt ); } -//---------------------------- + ULONG STDMETHODCALLTYPE CPropertyHdl::Release( void ) { long refcnt = InterlockedDecrement( &m_RefCnt ); @@ -138,9 +138,9 @@ ULONG STDMETHODCALLTYPE CPropertyHdl::Release( void ) return refcnt; } -//----------------------------- + // IPropertyStore -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertyHdl::GetCount( DWORD *pcProps ) { HRESULT hr = E_UNEXPECTED; @@ -152,7 +152,7 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::GetCount( DWORD *pcProps ) return hr; } -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertyHdl::GetAt( DWORD iProp, PROPERTYKEY *pKey ) { HRESULT hr = E_UNEXPECTED; @@ -164,7 +164,7 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::GetAt( DWORD iProp, PROPERTYKEY *pKey ) return hr; } -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertyHdl::GetValue( REFPROPERTYKEY key, PROPVARIANT *pPropVar ) { HRESULT hr = E_UNEXPECTED; @@ -176,7 +176,7 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::GetValue( REFPROPERTYKEY key, PROPVARIAN return hr; } -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertyHdl::SetValue(REFPROPERTYKEY /*key*/, REFPROPVARIANT /*propVar*/) { @@ -188,15 +188,15 @@ CPropertyHdl::SetValue(REFPROPERTYKEY /*key*/, REFPROPVARIANT /*propVar*/) return hr; } -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertyHdl::Commit() { return S_OK; } -//----------------------------- + // IPropertyStore -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertyHdl::IsPropertyWritable(REFPROPERTYKEY /*key*/) { @@ -204,9 +204,9 @@ CPropertyHdl::IsPropertyWritable(REFPROPERTYKEY /*key*/) return S_FALSE; } -//----------------------------- + // IInitializeWithStream -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertyHdl::Initialize( IStream *pStream, DWORD grfMode ) { if ( grfMode & STGM_READWRITE ) @@ -241,7 +241,7 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::Initialize( IStream *pStream, DWORD grfM return S_OK; } -//----------------------------- + void CPropertyHdl::LoadProperties( CMetaInfoReader *pMetaInfoReader ) { OutputDebugStringFormat( "CPropertyHdl: LoadProperties\n" ); @@ -264,7 +264,7 @@ void CPropertyHdl::LoadProperties( CMetaInfoReader *pMetaInfoReader ) } } -//----------------------------- + HRESULT CPropertyHdl::GetItemData( CMetaInfoReader *pMetaInfoReader, UINT nIndex, PROPVARIANT *pVarData ) { switch (nIndex) { @@ -309,13 +309,13 @@ HRESULT CPropertyHdl::GetItemData( CMetaInfoReader *pMetaInfoReader, UINT nIndex return S_FALSE; } -//----------------------------------------------------------------------------- + // CClassFactory -//----------------------------------------------------------------------------- + long CClassFactory::s_ServerLocks = 0; -//----------------------------------------------------------------------------- + CClassFactory::CClassFactory( const CLSID& clsid ) : m_RefCnt(1), m_Clsid(clsid) @@ -323,15 +323,15 @@ CClassFactory::CClassFactory( const CLSID& clsid ) : InterlockedIncrement( &g_DllRefCnt ); } -//----------------------------------------------------------------------------- + CClassFactory::~CClassFactory() { InterlockedDecrement( &g_DllRefCnt ); } -//----------------------------------------------------------------------------- + // IUnknown methods -//----------------------------------------------------------------------------- + HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface( REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject ) { *ppvObject = 0; @@ -347,13 +347,13 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface( REFIID riid, void __RPC return E_NOINTERFACE; } -//----------------------------------------------------------------------------- + ULONG STDMETHODCALLTYPE CClassFactory::AddRef( void ) { return InterlockedIncrement( &m_RefCnt ); } -//----------------------------------------------------------------------------- + ULONG STDMETHODCALLTYPE CClassFactory::Release( void ) { long refcnt = InterlockedDecrement( &m_RefCnt ); @@ -364,9 +364,9 @@ ULONG STDMETHODCALLTYPE CClassFactory::Release( void ) return refcnt; } -//----------------------------------------------------------------------------- + // IClassFactory methods -//----------------------------------------------------------------------------- + HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( IUnknown __RPC_FAR *pUnkOuter, REFIID riid, @@ -393,7 +393,7 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( return hr; } -//----------------------------------------------------------------------------- + HRESULT STDMETHODCALLTYPE CClassFactory::LockServer( BOOL fLock ) { if ( fLock ) @@ -404,13 +404,13 @@ HRESULT STDMETHODCALLTYPE CClassFactory::LockServer( BOOL fLock ) return S_OK; } -//----------------------------------------------------------------------------- + bool CClassFactory::IsLocked() { return ( s_ServerLocks > 0 ); } -//----------------------------------------------------------------------------- + extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) { OutputDebugStringFormat( "DllGetClassObject.\n" ); @@ -427,7 +427,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) return S_OK; } -//----------------------------------------------------------------------------- + extern "C" STDAPI DllCanUnloadNow( void ) { OutputDebugStringFormat( "DllCanUnloadNow.\n" ); @@ -437,7 +437,7 @@ extern "C" STDAPI DllCanUnloadNow( void ) return S_OK; } -//----------------------------------------------------------------------------- + BOOL WINAPI DllMain( HINSTANCE hInst, ULONG /*ul_reason_for_call*/, LPVOID /*lpReserved*/ ) { OutputDebugStringFormat( "DllMain.\n" ); diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx index 91d7632507f4..7984f2dc22dc 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx @@ -31,7 +31,7 @@ #include <tchar.h> #include "internal/resource.h" -//------------------------------------ + list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2) @@ -42,7 +42,7 @@ list_view_builder_ptr create_list_view_builder( return list_view_builder_ptr(new list_view_builder(hwnd_lv, col1, col2)); } -//------------------------------------ + list_view_builder::list_view_builder( HWND hwnd_list_view, @@ -55,13 +55,13 @@ list_view_builder::list_view_builder( { } -//------------------------------------ + list_view_builder::~list_view_builder() { } -//------------------------------------ + void list_view_builder::build(statistic_group_list_t& gl) { @@ -83,7 +83,7 @@ void list_view_builder::build(statistic_group_list_t& gl) } } -//------------------------------------ + void list_view_builder::setup_list_view() { @@ -113,14 +113,14 @@ void list_view_builder::setup_list_view() ListView_InsertColumn(hwnd_list_view_, 1, &lvc); } -//------------------------------------ + void list_view_builder::insert_group(const std::wstring& /*title*/) { insert_item(L"", L"", false); } -//------------------------------------ + void list_view_builder::insert_item(const std::wstring& title, const std::wstring& value, bool is_editable) { @@ -153,14 +153,14 @@ void list_view_builder::insert_item(const std::wstring& title, const std::wstrin ListView_SetItem(hwnd_list_view_, &lvi); } -//------------------------------------ + HWND list_view_builder::get_list_view() const { return hwnd_list_view_; } -//------------------------------------ + winxp_list_view_builder::winxp_list_view_builder( HWND hwnd_list_view, @@ -172,7 +172,7 @@ winxp_list_view_builder::winxp_list_view_builder( { } -//------------------------------------ + void winxp_list_view_builder::setup_list_view() { @@ -181,7 +181,7 @@ void winxp_list_view_builder::setup_list_view() ListView_EnableGroupView(get_list_view(), TRUE); } -//------------------------------------ + void winxp_list_view_builder::insert_group(const std::wstring& name) { @@ -200,7 +200,7 @@ void winxp_list_view_builder::insert_group(const std::wstring& name) ListView_InsertGroup(get_list_view(), row_count_++, &lvg); } -//------------------------------------ + 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/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index 505346d6b0dc..936b3dba32f2 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -49,7 +49,7 @@ INFO - INFO - INFO - INFO - INFO - INFO ----------------------------------------------*/ -//----------------------------- + CPropertySheet::CPropertySheet(long RefCnt) : m_RefCnt(RefCnt) @@ -58,7 +58,7 @@ CPropertySheet::CPropertySheet(long RefCnt) : InterlockedIncrement(&g_DllRefCnt); } -//----------------------------- + CPropertySheet::~CPropertySheet() { @@ -66,9 +66,9 @@ CPropertySheet::~CPropertySheet() InterlockedDecrement(&g_DllRefCnt); } -//----------------------------- + // IUnknown methods -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface( REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) @@ -94,7 +94,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface( return E_NOINTERFACE; } -//----------------------------- + ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void) { @@ -102,7 +102,7 @@ ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void) return InterlockedIncrement(&m_RefCnt); } -//----------------------------- + ULONG STDMETHODCALLTYPE CPropertySheet::Release(void) { @@ -115,9 +115,9 @@ ULONG STDMETHODCALLTYPE CPropertySheet::Release(void) return refcnt; } -//----------------------------- + // IShellExtInit -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertySheet::Initialize( LPCITEMIDLIST /*pidlFolder*/, LPDATAOBJECT lpdobj, HKEY /*hkeyProgID*/) @@ -166,9 +166,9 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::Initialize( return hr; } -//----------------------------- + // IShellPropSheetExt -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) { @@ -239,7 +239,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddP return NOERROR; } -//----------------------------- + HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( UINT /*uPageID*/, LPFNADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/) @@ -247,7 +247,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( return E_NOTIMPL; } -//----------------------------- + UINT CALLBACK CPropertySheet::PropPageSummaryCallback( HWND /*hwnd*/, UINT uMsg, LPPROPSHEETPAGE ppsp) @@ -266,7 +266,7 @@ UINT CALLBACK CPropertySheet::PropPageSummaryCallback( } -//----------------------------- + BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { @@ -284,7 +284,7 @@ BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM return FALSE; } -//----------------------------- + BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { @@ -329,7 +329,7 @@ void CPropertySheet::InitPropPageSummary(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/) } } -//--------------------------------- + /** */ void CPropertySheet::InitPropPageStatistics(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/) diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index a2f8a1d3bc8a..74357bfddc34 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -29,9 +29,9 @@ #include <string> #include <shlobj.h> -//--------------------------- + // Module global -//--------------------------- + long g_DllRefCnt = 0; HINSTANCE g_hModule = NULL; @@ -53,10 +53,10 @@ namespace /* private */ const char* SHELL_EXTENSION_APPROVED_KEY_NAME = "Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"; - //--------------------------- + // "String Placeholder" -> // "String Replacement" - //--------------------------- + void SubstitutePlaceholder(std::string& String, const std::string& Placeholder, const std::string& Replacement) { std::string::size_type idx = String.find(Placeholder); @@ -298,9 +298,9 @@ namespace /* private */ } // namespace /* private */ -//--------------------- + // COM exports -//--------------------- + extern "C" STDAPI DllRegisterServer() { diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx index 3e12e040cce5..2ee68f3b5f42 100644 --- a/shell/source/win32/shlxthandler/util/fileextensions.cxx +++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx @@ -21,7 +21,7 @@ #include "internal/fileextensions.hxx" #include <sal/macros.h> -//------------------------------------ + const std::string WRITER_FILE_EXTENSIONS = "sxwstwsxgodtottodm"; const std::string CALC_FILE_EXTENSIONS = "sxcstcodsots"; @@ -59,7 +59,7 @@ FileExtensionEntry OOFileExtensionTable[] = { size_t OOFileExtensionTableSize = sizeof(OOFileExtensionTable)/sizeof(OOFileExtensionTable[0]); -//--------------------------------- + /** Return the extension of a file name without the '.' */ @@ -73,7 +73,7 @@ std::string get_file_name_extension(const std::string& file_name) return std::string(); } -//--------------------------------- + /** Return the type of a file */ diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx index bcf089d28abd..537ca8d36ab1 100644 --- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx +++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx @@ -27,7 +27,7 @@ #include <sstream> #include <iomanip> -//----------------------------------- + /* Converts ISO 8601 conform date/time represenation to the representation conforming to the current locale @@ -88,7 +88,7 @@ std::wstring iso8601_date_to_local_date(const std::wstring& isoDate ) return ws8601DateTime; } -//------------------------------------ + /* Converts ISO 8601 conform duration representation to the representation conforming to the current locale diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index 01bb22587952..256ebd16c17c 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -36,12 +36,12 @@ #pragma warning(pop) #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) { @@ -64,7 +64,7 @@ bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, co return (ERROR_SUCCESS == rc); } -//--------------------------------------- + bool DeleteRegistryKey(HKEY RootKey, const char* KeyName) { @@ -163,7 +163,7 @@ std::string ClsidToString(const CLSID& clsid) return std::string(buff); } -//--------------------------------------- + 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 6fc78002a339..1f2423dbd40a 100644 --- a/shell/source/win32/shlxthandler/util/utilities.cxx +++ b/shell/source/win32/shlxthandler/util/utilities.cxx @@ -25,9 +25,9 @@ #include "internal/config.hxx" #include "internal/utilities.hxx" -//----------------------------- + // constants -//----------------------------- + const size_t MAX_RES_STRING = 1024; const wchar_t SPACE_CHAR = _T(' '); @@ -60,7 +60,7 @@ static std::string WStringToString(const std::wstring& String, int codepage) return std::string(buff); } -//--------------------------------- + /** */ std::wstring StringToWString(const std::string& String) @@ -68,7 +68,7 @@ std::wstring StringToWString(const std::string& String) return StringToWString(String, CP_ACP); } -//--------------------------------- + /** */ std::string WStringToString(const std::wstring& String) @@ -76,7 +76,7 @@ std::string WStringToString(const std::wstring& String) return WStringToString(String, CP_ACP); } -//--------------------------------- + /** */ std::wstring UTF8ToWString(const std::string& String) @@ -84,7 +84,7 @@ std::wstring UTF8ToWString(const std::string& String) return StringToWString(String, CP_UTF8); } -//--------------------------------- + /** */ std::wstring GetResString(int ResId) @@ -99,7 +99,7 @@ std::wstring GetResString(int ResId) return std::wstring(szResStr); } -//--------------------------------- + /** */ bool is_windows_xp_or_above() @@ -118,7 +118,7 @@ bool is_windows_xp_or_above() return false; } -//--------------------------------- + /** helper function to judge if the string is only has spaces. @returns <TRUE>if the provided string contains only but at least one space @@ -141,7 +141,7 @@ bool HasOnlySpaces(const std::wstring& String) return true; } -//--------------------------------- + /** helper function to convert windows paths to short form. @returns shortend path. diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 6fa91c379b21..5812d1e41e1c 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -22,9 +22,9 @@ #include <osl/diagnose.h> #include "smplmailsuppl.hxx" -//----------------------------------------------------------------------- + // namespace directives -//----------------------------------------------------------------------- + using namespace ::rtl ; using namespace ::com::sun::star::uno ; @@ -37,7 +37,7 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_SERVICE_NAME "com.sun.star.system.SimpleSystemMail" #define COMP_IMPL_NAME "com.sun.star.system.SimpleSystemMail" -//----------------------------------------------------------------------- + namespace { @@ -49,10 +49,10 @@ namespace extern "C" { -//---------------------------------------------------------------------- + // component_getFactory // returns a factory to create XFilePicker-Services -//---------------------------------------------------------------------- + SAL_DLLPUBLIC_EXPORT void* SAL_CALL smplmail_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx index d37fe836183a..1870b16ad3b0 100644 --- a/shell/source/win32/simplemail/smplmailmsg.cxx +++ b/shell/source/win32/simplemail/smplmailmsg.cxx @@ -22,9 +22,9 @@ #include <osl/file.h> #include "smplmailmsg.hxx" -//------------------------------------------------------------------------ + // namespace directives -//------------------------------------------------------------------------ + using com::sun::star::uno::Reference; using com::sun::star::uno::RuntimeException; @@ -35,9 +35,9 @@ using osl::Mutex; using namespace cppu; -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + CSmplMailMsg::CSmplMailMsg( ) { @@ -55,7 +55,7 @@ void SAL_CALL CSmplMailMsg::setBody( const ::rtl::OUString& aBody ) return m_aBody; } -//------------------------------------------------ + void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient ) throw (RuntimeException) @@ -63,7 +63,7 @@ void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient ) m_aRecipient = aRecipient; } -//------------------------------------------------ + OUString SAL_CALL CSmplMailMsg::getRecipient( ) throw (RuntimeException) @@ -71,7 +71,7 @@ OUString SAL_CALL CSmplMailMsg::getRecipient( ) return m_aRecipient; } -//------------------------------------------------ + void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient ) throw (RuntimeException) @@ -79,7 +79,7 @@ void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecip m_CcRecipients = aCcRecipient; } -//------------------------------------------------ + Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) throw (RuntimeException) @@ -87,7 +87,7 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) return m_CcRecipients; } -//------------------------------------------------ + void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient ) throw (RuntimeException) @@ -95,7 +95,7 @@ void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRec m_BccRecipients = aBccRecipient; } -//------------------------------------------------ + Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) throw (RuntimeException) @@ -103,7 +103,7 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) return m_BccRecipients; } -//------------------------------------------------ + void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) throw (RuntimeException) @@ -111,7 +111,7 @@ void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) m_aOriginator = aOriginator; } -//------------------------------------------------ + OUString SAL_CALL CSmplMailMsg::getOriginator( ) throw (RuntimeException) @@ -119,7 +119,7 @@ OUString SAL_CALL CSmplMailMsg::getOriginator( ) return m_aOriginator; } -//------------------------------------------------ + void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) throw (RuntimeException) @@ -127,7 +127,7 @@ void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) m_aSubject = aSubject; } -//------------------------------------------------ + OUString SAL_CALL CSmplMailMsg::getSubject( ) throw (RuntimeException) @@ -135,7 +135,7 @@ OUString SAL_CALL CSmplMailMsg::getSubject( ) return m_aSubject; } -//------------------------------------------------ + void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttachement ) throw (IllegalArgumentException, RuntimeException) @@ -143,7 +143,7 @@ void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttache m_Attachements = aAttachement; } -//------------------------------------------------ + Sequence< OUString > SAL_CALL CSmplMailMsg::getAttachement( ) throw (RuntimeException) diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx index 99e08359e17a..6d32d387a49e 100644 --- a/shell/source/win32/workbench/TestSmplMail.cxx +++ b/shell/source/win32/workbench/TestSmplMail.cxx @@ -36,9 +36,9 @@ #include <osl/file.hxx> -//-------------------------------------------------------------- + // namesapces -//-------------------------------------------------------------- + using namespace ::rtl ; using namespace ::cppu ; @@ -49,24 +49,24 @@ using namespace com::sun::star::system; #define RDB_SYSPATH "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\applicat.rdb" -//-------------------------------------------------------------- + // global variables -//-------------------------------------------------------------- + Reference< XMultiServiceFactory > g_xFactory; -//-------------------------------------------------------------- + // main -//-------------------------------------------------------------- + // int SAL_CALL main(int nArgc, char* Argv[], char* pEnv[] ) // make Warning free, leave out typename int SAL_CALL main(int , char*, char* ) { - //------------------------------------------------- + // get the global service-manager - //------------------------------------------------- + // Get global factory for uno services. OUString rdbName = OUString( RDB_SYSPATH ); @@ -81,9 +81,9 @@ int SAL_CALL main(int , char*, char* ) printf("Creating RegistryServiceFactory successful\n"); - //------------------------------------------------- + // try to get an Interface to a XFilePicker Service - //------------------------------------------------- + try { @@ -144,9 +144,9 @@ int SAL_CALL main(int , char*, char* ) { } - //-------------------------------------------------- + // shutdown - //-------------------------------------------------- + // Cast factory to XComponent Reference< XComponent > xComponent( g_xFactory, UNO_QUERY ); diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx index 6d6ffb302420..fe1936ddb6ff 100644 --- a/shell/source/win32/workbench/TestSysShExec.cxx +++ b/shell/source/win32/workbench/TestSysShExec.cxx @@ -38,9 +38,9 @@ #pragma warning(pop) #endif -//-------------------------------------------------------------- + // namesapces -//-------------------------------------------------------------- + using namespace ::rtl ; using namespace ::cppu ; @@ -51,24 +51,24 @@ using namespace com::sun::star::system; #define RDB_SYSPATH "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\applicat.rdb" -//-------------------------------------------------------------- + // global variables -//-------------------------------------------------------------- + Reference< XMultiServiceFactory > g_xFactory; -//-------------------------------------------------------------- + // main -//-------------------------------------------------------------- + // int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) int SAL_CALL main(int nArgc, char* Argv[], char* ) { - //------------------------------------------------- + // get the global service-manager - //------------------------------------------------- + if ( nArgc < 4 ) return 0; @@ -86,9 +86,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char* ) printf("Creating RegistryServiceFactory successful\n"); - //------------------------------------------------- + // try to get an Interface to a XFilePicker Service - //------------------------------------------------- + Reference< XSystemShellExecute > xSysShExec( g_xFactory->createInstance("com.sun.star.system.SystemShellExecute"), UNO_QUERY ); @@ -116,9 +116,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char* ) OSL_FAIL( "Invalid parameter" ); } - //-------------------------------------------------- + // shutdown - //-------------------------------------------------- + // Cast factory to XComponent Reference< XComponent > xComponent( g_xFactory, UNO_QUERY ); diff --git a/shell/source/win32/zipfile/zipexcptn.cxx b/shell/source/win32/zipfile/zipexcptn.cxx index 0f8e7fedcde9..f42165022eed 100644 --- a/shell/source/win32/zipfile/zipexcptn.cxx +++ b/shell/source/win32/zipfile/zipexcptn.cxx @@ -20,7 +20,7 @@ #include "internal/global.hxx" #include "zipexcptn.hxx" -//------------------------------------------ + /** */ RuntimeException::RuntimeException(int Error) : @@ -28,14 +28,14 @@ RuntimeException::RuntimeException(int Error) : { } -//------------------------------------------ + /** */ RuntimeException::~RuntimeException() throw() { } -//------------------------------------------ + /** */ int RuntimeException::GetErrorCode() const @@ -43,7 +43,7 @@ int RuntimeException::GetErrorCode() const return m_Error; } -//------------------------------------------ + /** */ ZipException::ZipException(int Error) : @@ -51,7 +51,7 @@ ZipException::ZipException(int Error) : { } -//------------------------------------------ + /** */ const char* ZipException::what() const throw() @@ -59,7 +59,7 @@ const char* ZipException::what() const throw() return 0; } -//------------------------------------------ + /** */ Win32Exception::Win32Exception(int Error) : @@ -68,7 +68,7 @@ Win32Exception::Win32Exception(int Error) : { } -//------------------------------------------ + /** */ Win32Exception::~Win32Exception() throw() @@ -77,7 +77,7 @@ Win32Exception::~Win32Exception() throw() LocalFree(m_MsgBuff); } -//------------------------------------------ + /** */ const char* Win32Exception::what() const throw() @@ -96,7 +96,7 @@ const char* Win32Exception::what() const throw() return reinterpret_cast<char*>(m_MsgBuff); } -//------------------------------------------ + /** */ ZipContentMissException::ZipContentMissException(int Error) : @@ -104,7 +104,7 @@ ZipContentMissException::ZipContentMissException(int Error) : { } -//------------------------------------------ + /** */ AccessViolationException::AccessViolationException(int Error) : @@ -112,7 +112,7 @@ AccessViolationException::AccessViolationException(int Error) : { } -//------------------------------------------ + /** */ IOException::IOException(int Error) : |