diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-04-18 17:13:03 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-19 13:42:07 +0200 |
commit | 2b83e73fd7b059c4ad224e3163f9d57c6cc6e1c7 (patch) | |
tree | eb160ecdcaf9ba8c114eeef82261d9ad199d5b40 /include/tools | |
parent | sw: replace rudimentary SwCursorShell::m_nBasicActionCnt (diff) | |
download | core-2b83e73fd7b059c4ad224e3163f9d57c6cc6e1c7.tar.gz core-2b83e73fd7b059c4ad224e3163f9d57c6cc6e1c7.zip |
remove freshly unused menu support from src files
Change-Id: I038711a0c4d440d452d5b2ae1bfcba5c9305815b
Reviewed-on: https://gerrit.libreoffice.org/36646
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/tools')
-rw-r--r-- | include/tools/rc.h | 55 | ||||
-rw-r--r-- | include/tools/rc.hxx | 28 | ||||
-rw-r--r-- | include/tools/rcid.h | 2 | ||||
-rw-r--r-- | include/tools/resmgr.hxx | 14 |
4 files changed, 0 insertions, 99 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h deleted file mode 100644 index 84bb8e255972..000000000000 --- a/include/tools/rc.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_TOOLS_RC_H -#define INCLUDED_TOOLS_RC_H - -#include <tools/rcid.h> -#include <o3tl/typed_flags_set.hxx> - -// Attributes in *.src files - -// For all menu resources: -enum class RscMenu { - Items = 0x01, - Text = 0x02, -}; -namespace o3tl { - template<> struct typed_flags<RscMenu> : is_typed_flags<RscMenu, 0x03> {}; -} - -// "MenuItem" resource options: -enum class RscMenuItem { - Separator = 0x001, - Id = 0x002, - Status = 0x004, - Text = 0x008, - HelpText = 0x020, - HelpId = 0x040, - Menu = 0x100, - Disable = 0x400, - Command = 0x800 -}; -namespace o3tl { - template<> struct typed_flags<RscMenuItem> : is_typed_flags<RscMenuItem, 0xd6f> {}; -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx index 20df1fe9b1de..2338f7ed593f 100644 --- a/include/tools/rc.hxx +++ b/include/tools/rc.hxx @@ -27,39 +27,11 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Resource protected: ResMgr* m_pResMgr; - // Load a Resource - void GetRes( const ResId& rResId ); - // check Resource state #ifdef DBG_UTIL void TestRes(); #endif - // Get a pointer to the Resource's data - void* GetClassRes() - { return m_pResMgr->GetClass(); } - - // increase the memory pointer gotten by GetClassRes() - void IncrementRes( sal_uInt32 nBytes ) - { m_pResMgr->Increment( nBytes ); } - - // return the memory size of a Resource data block - static sal_uInt32 GetObjSizeRes( RSHEADER_TYPE * pHT ) - { return ResMgr::GetObjSize( pHT ); } - - // read a 32bit value from resource data and increment pointer - sal_Int32 ReadLongRes() - { return m_pResMgr->ReadLong(); } - // read a 16bit value from resource data and increment pointer - sal_Int16 ReadShortRes() - { return m_pResMgr->ReadShort(); } - // read a string from resource data and increment pointer - OUString ReadStringRes() - { return m_pResMgr->ReadString(); } - // read a byte string from resource data and increment pointer - OString ReadByteStringRes() - { return m_pResMgr->ReadByteString(); } - // constructors Resource() : m_pResMgr( nullptr ) {} diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 6c6cbf4fe663..0c095e8109c4 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -35,8 +35,6 @@ #define RSC_RESOURCE (RSC_NOTYPE + RESOURCE_TYPE(0x10)) #define RSC_STRING (RSC_NOTYPE + RESOURCE_TYPE(0x11)) #define RSC_BITMAP (RSC_NOTYPE + RESOURCE_TYPE(0x13)) -#define RSC_MENU (RSC_NOTYPE + RESOURCE_TYPE(0x1c)) -#define RSC_MENUITEM (RSC_NOTYPE + RESOURCE_TYPE(0x1d)) // only used internally #define RSC_STRINGARRAY (RSC_NOTYPE + RESOURCE_TYPE(0x79)) diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx index 97126298818e..5a6cd3272aae 100644 --- a/include/tools/resmgr.hxx +++ b/include/tools/resmgr.hxx @@ -155,14 +155,8 @@ public: /// Increment resource pointer void* Increment( sal_uInt32 nSize ); - /// Size of an object within the resource - static sal_uInt32 GetObjSize( RSHEADER_TYPE* pHT ) - { return( pHT->GetGlobOff() ); } - /// Return a string and its length out of the resource static sal_uInt32 GetString( OUString& rStr, const sal_uInt8* pStr ); - /// Return a byte string and its length out of the resource - static sal_uInt32 GetByteString( OString& rStr, const sal_uInt8* pStr ); /// Return the size of a string in the resource static sal_uInt32 GetStringSize( sal_uInt32 nLen ) @@ -173,22 +167,14 @@ public: static sal_uInt64 GetUInt64( void const * pDatum ); /// Return a long static sal_Int32 GetLong( void const * pLong ); - /// Return a short - static sal_Int16 GetShort( void const * pShort ); /// Return a pointer to the resource void * GetClass(); - RSHEADER_TYPE * CreateBlock( const ResId & rId ); - - sal_uInt32 GetRemainSize(); - const OUString& GetFileName() const; - sal_Int16 ReadShort(); sal_Int32 ReadLong(); OUString ReadString(); - OString ReadByteString(); static void SetReadStringHook( ResHookProc pProc ); static ResHookProc GetReadStringHook(); |