diff options
Diffstat (limited to 'shell/source/win32/shlxthandler')
13 files changed, 0 insertions, 63 deletions
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index 977b3ce8168e..9ca1efedfaf0 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -31,11 +31,9 @@ using ::std::min; #include "internal/shlxthdl.hxx" - long CClassFactory::s_ServerLocks = 0; - CClassFactory::CClassFactory(const CLSID& clsid) : m_RefCnt(1), m_Clsid(clsid) @@ -44,7 +42,6 @@ CClassFactory::CClassFactory(const CLSID& clsid) : } - CClassFactory::~CClassFactory() { InterlockedDecrement(&g_DllRefCnt); @@ -70,14 +67,12 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_ } - ULONG STDMETHODCALLTYPE CClassFactory::AddRef() { return InterlockedIncrement(&m_RefCnt); } - ULONG STDMETHODCALLTYPE CClassFactory::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); @@ -128,7 +123,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( } - HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) { if (fLock) @@ -140,7 +134,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) } - bool CClassFactory::IsLocked() { return (s_ServerLocks > 0); diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index ac45cb7faf62..8f3f11e5a4b7 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -43,7 +43,6 @@ namespace /* private */ } - CColumnInfo::CColumnInfo(long RefCnt) : m_RefCnt(RefCnt) { @@ -51,7 +50,6 @@ CColumnInfo::CColumnInfo(long RefCnt) : } - CColumnInfo::~CColumnInfo() { InterlockedDecrement(&g_DllRefCnt); @@ -77,14 +75,12 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FA } - ULONG STDMETHODCALLTYPE CColumnInfo::AddRef() { return InterlockedIncrement(&m_RefCnt); } - ULONG STDMETHODCALLTYPE CColumnInfo::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); @@ -188,7 +184,6 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOL } - bool CColumnInfo::IsOOFileExtension(wchar_t* Extension) const { for (size_t i = 0; i < OOFileExtensionTableSize; i++) diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx index 4d6241a40ca1..6f309485c93d 100644 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -39,7 +39,6 @@ const std::wstring WSPACE = std::wstring(SPACE); - CInfoTip::CInfoTip(long RefCnt) : m_RefCnt(RefCnt) { @@ -48,7 +47,6 @@ CInfoTip::CInfoTip(long RefCnt) : } - CInfoTip::~CInfoTip() { InterlockedDecrement(&g_DllRefCnt); @@ -83,14 +81,12 @@ HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR * } - ULONG STDMETHODCALLTYPE CInfoTip::AddRef() { return InterlockedIncrement(&m_RefCnt); } - ULONG STDMETHODCALLTYPE CInfoTip::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); @@ -301,7 +297,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws } - HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoFlags(DWORD * /*pdwFlags*/ ) { return E_NOTIMPL; @@ -346,28 +341,24 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ } - HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty() { 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*/) { return E_NOTIMPL; diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index a4d038fe7599..ea266ac613d7 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -18,7 +18,6 @@ */ - // File: ooofilt.cxx // Contents: Filter Implementation for OpenOffice.Org Document using // Indexing Service @@ -959,7 +958,6 @@ STDAPI DllRegisterServer() } - STDAPI DllUnregisterServer() { return S_OK; diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index b9c586442097..b842234bfba1 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -59,7 +59,6 @@ PROPERTYMAP g_rgPROPERTYMAP[] = size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]); - CPropertyHdl::CPropertyHdl( long nRefCnt ) : m_RefCnt( nRefCnt ), m_pCache( NULL ) @@ -69,7 +68,6 @@ CPropertyHdl::CPropertyHdl( long nRefCnt ) : } - CPropertyHdl::~CPropertyHdl() { if ( m_pCache ) diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx index 45a747784600..1a4a21d6c7ab 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx @@ -26,8 +26,6 @@ #include "internal/metainforeader.hxx" - - struct statistic_item { statistic_item(); @@ -47,20 +45,17 @@ struct statistic_item }; - typedef std::vector<statistic_item> statistic_item_list_t; typedef std::pair<std::wstring, statistic_item_list_t> statistic_group_t; typedef std::vector<statistic_group_t> statistic_group_list_t; - class document_statistic_reader; typedef std::unique_ptr<document_statistic_reader> document_statistic_reader_ptr; document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor); - class document_statistic_reader { public: @@ -86,7 +81,6 @@ private: }; - class writer_document_statistic_reader : public document_statistic_reader { protected: @@ -99,7 +93,6 @@ protected: }; - class calc_document_statistic_reader : public document_statistic_reader { protected: @@ -112,7 +105,6 @@ protected: }; - class draw_impress_math_document_statistic_reader : public document_statistic_reader { protected: diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx index 7984f2dc22dc..90d6b7fd9d1d 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx @@ -32,7 +32,6 @@ #include "internal/resource.h" - list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2) { @@ -43,7 +42,6 @@ list_view_builder_ptr create_list_view_builder( } - list_view_builder::list_view_builder( HWND hwnd_list_view, const std::wstring& column1_title, @@ -56,13 +54,11 @@ list_view_builder::list_view_builder( } - list_view_builder::~list_view_builder() { } - void list_view_builder::build(statistic_group_list_t& gl) { setup_list_view(); @@ -84,7 +80,6 @@ void list_view_builder::build(statistic_group_list_t& gl) } - void list_view_builder::setup_list_view() { HIMAGELIST h_ils = ImageList_Create(16,15,ILC_MASK, 7, 0); @@ -114,14 +109,12 @@ void list_view_builder::setup_list_view() } - 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) { LVITEM lvi; @@ -154,14 +147,12 @@ void list_view_builder::insert_item(const std::wstring& title, const std::wstrin } - HWND list_view_builder::get_list_view() const { return hwnd_list_view_; } - winxp_list_view_builder::winxp_list_view_builder( HWND hwnd_list_view, const std::wstring& column1_title, @@ -173,7 +164,6 @@ winxp_list_view_builder::winxp_list_view_builder( } - void winxp_list_view_builder::setup_list_view() { list_view_builder::setup_list_view(); @@ -182,7 +172,6 @@ void winxp_list_view_builder::setup_list_view() } - void winxp_list_view_builder::insert_group(const std::wstring& name) { LVGROUP lvg; @@ -201,7 +190,6 @@ void winxp_list_view_builder::insert_group(const std::wstring& name) } - void winxp_list_view_builder::insert_item( const std::wstring& title, const std::wstring& value, bool is_editable) { diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx index 870c33c1dd87..bb0072f49da4 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx @@ -33,7 +33,6 @@ #include "document_statistic.hxx" - class list_view_builder; typedef std::unique_ptr<list_view_builder> list_view_builder_ptr; @@ -42,7 +41,6 @@ list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2); - class list_view_builder { public: @@ -74,7 +72,6 @@ private: }; - class winxp_list_view_builder : public list_view_builder { protected: diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index 6d1a146bfd34..aa938e53a405 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -53,7 +53,6 @@ ----------------------------------------------*/ - CPropertySheet::CPropertySheet(long RefCnt) : m_RefCnt(RefCnt) { @@ -62,7 +61,6 @@ CPropertySheet::CPropertySheet(long RefCnt) : } - CPropertySheet::~CPropertySheet() { OutputDebugStringFormat("CPropertySheet::DTor [%d], [%d]", m_RefCnt, g_DllRefCnt ); @@ -98,7 +96,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface( } - ULONG STDMETHODCALLTYPE CPropertySheet::AddRef() { OutputDebugStringFormat("CPropertySheet::AddRef [%d]", m_RefCnt ); @@ -106,7 +103,6 @@ ULONG STDMETHODCALLTYPE CPropertySheet::AddRef() } - ULONG STDMETHODCALLTYPE CPropertySheet::Release() { OutputDebugStringFormat("CPropertySheet::Release [%d]", m_RefCnt ); @@ -248,7 +244,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddP } - HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( UINT /*uPageID*/, LPFNADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/) { @@ -256,7 +251,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( } - UINT CALLBACK CPropertySheet::PropPageSummaryCallback( HWND /*hwnd*/, UINT uMsg, LPPROPSHEETPAGE ppsp) { @@ -274,8 +268,6 @@ UINT CALLBACK CPropertySheet::PropPageSummaryCallback( } - - BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { switch (uiMsg) @@ -293,7 +285,6 @@ BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM } - BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { switch (uiMsg) diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index 2983b381a1ab..821e91b2f747 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -295,7 +295,6 @@ namespace /* private */ } // namespace /* private */ - // COM exports diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index a1eb85fbebda..84e77f25bb41 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -288,8 +288,6 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Clone(IStream **) { return E_NOTIMPL; } - - CThumbviewer::CThumbviewer(long RefCnt) : ref_count_(RefCnt) { diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx index 2ee68f3b5f42..b827e5c896c8 100644 --- a/shell/source/win32/shlxthandler/util/fileextensions.cxx +++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx @@ -22,7 +22,6 @@ #include <sal/macros.h> - const std::string WRITER_FILE_EXTENSIONS = "sxwstwsxgodtottodm"; const std::string CALC_FILE_EXTENSIONS = "sxcstcodsots"; const std::string DRAW_FILE_EXTENSIONS = "sxdstdodgotg"; diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index 2e2838c1f805..ed000debeff9 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -58,7 +58,6 @@ bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, co } - bool DeleteRegistryKey(HKEY RootKey, const char* KeyName) { HKEY hKey; @@ -157,7 +156,6 @@ std::string ClsidToString(const CLSID& clsid) } - bool QueryRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, char *pszData, DWORD dwBufLen) { HKEY hKey; |