diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 20:36:36 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 07:55:24 -0600 |
commit | d18a2753d5a6e29312e08365f7d9a512a92b998e (patch) | |
tree | af5e93f3bbd08c187ce264b2154d42df180f0696 /shell/inc | |
parent | 7d99ec7f7ec095dfa0d203f5eb43bab0e69256be (diff) |
Remove visual noise from shell
Change-Id: I1857fd7a9aeda38cb8ef2a0eda7783203b7658ed
Reviewed-on: https://gerrit.libreoffice.org/8311
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'shell/inc')
-rw-r--r-- | shell/inc/internal/columninfo.hxx | 8 | ||||
-rw-r--r-- | shell/inc/internal/fileextensions.hxx | 4 | ||||
-rw-r--r-- | shell/inc/internal/infotips.hxx | 16 | ||||
-rw-r--r-- | shell/inc/internal/iso8601_converter.hxx | 4 | ||||
-rw-r--r-- | shell/inc/internal/propertyhdl.hxx | 24 | ||||
-rw-r--r-- | shell/inc/internal/propsheets.hxx | 12 | ||||
-rw-r--r-- | shell/inc/internal/registry.hxx | 4 | ||||
-rw-r--r-- | shell/inc/internal/thumbviewer.hxx | 16 | ||||
-rw-r--r-- | shell/inc/internal/types.hxx | 6 | ||||
-rw-r--r-- | shell/inc/internal/utilities.hxx | 18 | ||||
-rw-r--r-- | shell/inc/internal/xml_parser.hxx | 6 |
11 files changed, 59 insertions, 59 deletions
diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/internal/columninfo.hxx index 4f67b05c539f..68328777e1ac 100644 --- a/shell/inc/internal/columninfo.hxx +++ b/shell/inc/internal/columninfo.hxx @@ -36,9 +36,9 @@ public: CColumnInfo(long RefCnt = 1); virtual ~CColumnInfo(); - //----------------------------- + // IUnknown methods - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, @@ -48,9 +48,9 @@ public: virtual ULONG STDMETHODCALLTYPE Release( void); - //----------------------------- + // IColumnProvider - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE Initialize(LPCSHCOLUMNINIT psci); diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx index f1c82833cad1..119c626da881 100644 --- a/shell/inc/internal/fileextensions.hxx +++ b/shell/inc/internal/fileextensions.hxx @@ -43,13 +43,13 @@ extern FileExtensionEntry OOFileExtensionTable[]; extern size_t OOFileExtensionTableSize; -//--------------------------------- + /** Return the extension of a file name without the '.' */ std::string get_file_name_extension(const std::string& file_name); -//--------------------------------- + /** Return the type of a file */ diff --git a/shell/inc/internal/infotips.hxx b/shell/inc/internal/infotips.hxx index 99eb76013933..ec6615acace8 100644 --- a/shell/inc/internal/infotips.hxx +++ b/shell/inc/internal/infotips.hxx @@ -37,9 +37,9 @@ public: CInfoTip(long RefCnt = 1); virtual ~CInfoTip(); - //----------------------------- + // IUnknown methods - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, @@ -49,23 +49,23 @@ public: virtual ULONG STDMETHODCALLTYPE Release( void); - //---------------------------- + // IQueryInfo methods - //---------------------------- + virtual HRESULT STDMETHODCALLTYPE GetInfoTip(DWORD dwFlags, wchar_t** ppwszTip); virtual HRESULT STDMETHODCALLTYPE GetInfoFlags(DWORD *pdwFlags); - //---------------------------- + // IPersist methods - //---------------------------- + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID* pClassID); - //---------------------------- + // IPersistFile methods - //---------------------------- + virtual HRESULT STDMETHODCALLTYPE IsDirty(void); diff --git a/shell/inc/internal/iso8601_converter.hxx b/shell/inc/internal/iso8601_converter.hxx index 37be0edd20e0..ee682823cf4f 100644 --- a/shell/inc/internal/iso8601_converter.hxx +++ b/shell/inc/internal/iso8601_converter.hxx @@ -22,14 +22,14 @@ #include <string> -//----------------------------------- + /* Converts ISO 8601 conform date/time represenation to the representation conforming to the current locale */ std::wstring iso8601_date_to_local_date(const std::wstring& iso8601date); -//------------------------------------ + /* Converts ISO 8601 conform duration representation to the representation conforming to the current locale diff --git a/shell/inc/internal/propertyhdl.hxx b/shell/inc/internal/propertyhdl.hxx index 9d1b980e9218..e3ec5bf78ee2 100644 --- a/shell/inc/internal/propertyhdl.hxx +++ b/shell/inc/internal/propertyhdl.hxx @@ -43,32 +43,32 @@ public: CPropertyHdl(long RefCnt = 1); virtual ~CPropertyHdl(); - //----------------------------- + // IUnknown methods - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject ); virtual ULONG STDMETHODCALLTYPE AddRef( void ); virtual ULONG STDMETHODCALLTYPE Release( void ); - //----------------------------- + // IPropertyStore - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE GetCount( DWORD *pcProps ); virtual HRESULT STDMETHODCALLTYPE GetAt( DWORD iProp, PROPERTYKEY *pkey ); virtual HRESULT STDMETHODCALLTYPE GetValue( REFPROPERTYKEY key, PROPVARIANT *pPropVar ); virtual HRESULT STDMETHODCALLTYPE SetValue( REFPROPERTYKEY key, REFPROPVARIANT propVar ); virtual HRESULT STDMETHODCALLTYPE Commit(); - //----------------------------- + // IPropertyStoreCapabilities - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE IsPropertyWritable( REFPROPERTYKEY key ); - //----------------------------- + // IInitializeWithStream - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE Initialize(IStream *pStream, DWORD grfMode); private: @@ -86,18 +86,18 @@ public: CClassFactory( const CLSID& clsid ); virtual ~CClassFactory(); - //----------------------------- + // IUnknown methods - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject); virtual ULONG STDMETHODCALLTYPE AddRef( void ); virtual ULONG STDMETHODCALLTYPE Release( void ); - //----------------------------- + // IClassFactory methods - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE CreateInstance( IUnknown __RPC_FAR *pUnkOuter, REFIID riid, diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/internal/propsheets.hxx index b01df9e0ad1a..16c887eb2429 100644 --- a/shell/inc/internal/propsheets.hxx +++ b/shell/inc/internal/propsheets.hxx @@ -39,9 +39,9 @@ public: virtual ~CPropertySheet(); - //----------------------------- + // IUnknown methods - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, @@ -51,16 +51,16 @@ public: virtual ULONG STDMETHODCALLTYPE Release( void); - //----------------------------- + // IShellExtInit - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE Initialize( LPCITEMIDLIST pidlFolder, LPDATAOBJECT lpdobj, HKEY hkeyProgID); - //----------------------------- + // IShellPropSheetExt - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE AddPages(LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam); diff --git a/shell/inc/internal/registry.hxx b/shell/inc/internal/registry.hxx index bd9ff7816d63..5738064658e8 100644 --- a/shell/inc/internal/registry.hxx +++ b/shell/inc/internal/registry.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_SHELL_INC_INTERNAL_REGISTRY_HXX #define INCLUDED_SHELL_INC_INTERNAL_REGISTRY_HXX -//----------------------------- + // registry helper functions -//----------------------------- + #if defined _MSC_VER #pragma warning(push, 1) diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx index 4d8ab686e570..b6f9ea4b0916 100644 --- a/shell/inc/internal/thumbviewer.hxx +++ b/shell/inc/internal/thumbviewer.hxx @@ -45,9 +45,9 @@ public: CThumbviewer(long RefCnt = 1); virtual ~CThumbviewer(); - //----------------------------- + // IUnknown methods - //----------------------------- + virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, @@ -57,9 +57,9 @@ public: virtual ULONG STDMETHODCALLTYPE Release( void); - //---------------------------- + // IExtractImage methods - //---------------------------- + virtual HRESULT STDMETHODCALLTYPE Extract(HBITMAP *phBmpImage); @@ -71,15 +71,15 @@ public: DWORD dwRecClrDepth, DWORD *pdwFlags); - //---------------------------- + // IPersist methods - //---------------------------- + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID* pClassID); - //---------------------------- + // IPersistFile methods - //---------------------------- + virtual HRESULT STDMETHODCALLTYPE IsDirty(); diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx index b65fb9215dfd..d1470048fa62 100644 --- a/shell/inc/internal/types.hxx +++ b/shell/inc/internal/types.hxx @@ -32,7 +32,7 @@ typedef std::vector<std::wstring> StringList_t; // 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; typedef std::wstring Characters_t; @@ -48,7 +48,7 @@ const XmlTag_t EMPTY_XML_TAG = std::make_pair(std::wstring(), XmlTagAttributes_t // 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; typedef ::std::pair<Language_t, Country_t > LocaleSet_t; @@ -64,7 +64,7 @@ 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; typedef ::std::map<StyleName_t, LocaleSet_t> StyleLocaleMap_t; diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index 4d423e211134..b11c9aa7d313 100644 --- a/shell/inc/internal/utilities.hxx +++ b/shell/inc/internal/utilities.hxx @@ -60,37 +60,37 @@ extern "C" { #endif -//--------------------------------- + /** Convert a string to a wstring using CP_ACP */ std::wstring StringToWString(const std::string& String); -//--------------------------------- + /** Convert a wstring to a string using CP_ACP */ std::string WStringToString(const std::wstring& String); -//--------------------------------- + /** Convert a string to a wstring using CP_UTF8 */ std::wstring UTF8ToWString(const std::string& String); -//--------------------------------- + /** Retrieve a string from the resources of this module */ std::wstring GetResString(int ResId); -//--------------------------------- + /** Returns whether we are running on Windows XP or not */ bool is_windows_xp_or_above(); -//--------------------------------- + /** helper function to judge if the string is only has spaces. @returns <TRUE>if the provided string contains only but at least one space @@ -103,7 +103,7 @@ bool HasOnlySpaces(const std::wstring& String); Windows Locale Identifier corresponding to input LocaleSet. */ -//--------------------------------- + /** Convert a long path name using Windows api call GetShortPathName */ std::wstring getShortPathName( const std::wstring& aLongName ); @@ -111,7 +111,7 @@ std::wstring getShortPathName( const std::wstring& aLongName ); LCID LocaleSetToLCID( const LocaleSet_t & Locale ); -//---------------------------------------------------------- + #ifdef DEBUG inline void OutputDebugStringFormat( LPCSTR pFormat, ... ) { @@ -127,7 +127,7 @@ static inline void OutputDebugStringFormat( LPCSTR, ... ) { } #endif -//---------------------------------------------------------- + #endif diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx index 2d18ecadeb77..80083b105843 100644 --- a/shell/inc/internal/xml_parser.hxx +++ b/shell/inc/internal/xml_parser.hxx @@ -23,7 +23,7 @@ #include <expat.h> #include <stdexcept> -//----------------------------------------------------- + class xml_parser_exception : public std::runtime_error { public: @@ -48,10 +48,10 @@ public: }; -//----------------------------------------------------- + // Simple wrapper around expat, the xml parser library // created by James Clark -//----------------------------------------------------- + class i_xml_parser_event_handler; class xml_parser |