diff options
Diffstat (limited to 'framework/inc/classes')
| -rw-r--r-- | framework/inc/classes/fwkresid.hxx | 15 | ||||
| -rw-r--r-- | framework/inc/classes/resource.hrc | 67 | ||||
| -rw-r--r-- | framework/inc/classes/resource.hxx | 32 |
3 files changed, 34 insertions, 80 deletions
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index ba54eca5f081..c6606c5271e8 100644 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.hxx @@ -20,21 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX -#include <tools/resid.hxx> #include <framework/fwedllapi.h> +#include <rtl/ustring.hxx> -namespace framework -{ - -class FWE_DLLPUBLIC FwkResId : public ResId -{ - public: - FwkResId( sal_uInt16 nId ); - - static ResMgr* GetResManager(); -}; - -} +FWE_DLLPUBLIC OUString FwkResId(const char* pId); #endif // __FRAMEWORK_CLASSES_FWKRESID diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc deleted file mode 100644 index 72a45931b048..000000000000 --- a/framework/inc/classes/resource.hrc +++ /dev/null @@ -1,67 +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_FRAMEWORK_INC_CLASSES_RESOURCE_HRC -#define INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HRC - -#define RID_STR_START 2000 -#define RID_MENU_START 10000 -#define RID_IMAGE_START 15000 - -#define STR_MENU_HEADFOOTALL (RID_STR_START+2) -#define STR_UPDATEDOC (RID_STR_START+3) -#define STR_CLOSEDOC_ANDRETURN (RID_STR_START+4) -#define STR_SAVECOPYDOC (RID_STR_START+5) -#define STR_NODOCUMENT (RID_STR_START+6) -#define STR_TOOLBAR_TITLE_ADDON (RID_STR_START+7) - -#define STR_FULL_DISC_RETRY_BUTTON (RID_STR_START+9) // used by AuotSave to show error state: full disc -#define STR_FULL_DISC_MSG (RID_STR_START+10) // used by AuotSave to show error state: full disc -#define STR_RESTORE_TOOLBARS (RID_STR_START+11) -#define STR_CORRUPT_UICFG_SHARE (RID_STR_START+12) -#define STR_CORRUPT_UICFG_USER (RID_STR_START+13) -#define STR_CORRUPT_UICFG_GENERAL (RID_STR_START+14) -#define STR_LANGSTATUS_MULTIPLE_LANGUAGES (RID_STR_START+15) -#define STR_LANGSTATUS_NONE (RID_STR_START+16) -#define STR_LANGSTATUS_MORE (RID_STR_START+17) -#define STR_SET_LANGUAGE_FOR_PARAGRAPH (RID_STR_START+19) -#define STR_UNTITLED_DOCUMENT (RID_STR_START+21) -#define STR_RESET_TO_DEFAULT_LANGUAGE (RID_STR_START+22) -#define STR_CLEAR_RECENT_FILES (RID_STR_START+23) -#define STR_CLEAR_RECENT_FILES_HELP (RID_STR_START+24) -#define STR_LANGSTATUS_HINT (RID_STR_START+25) -#define STR_REMOTE_TITLE (RID_STR_START+26) -#define STR_SAFEMODE_TITLE (RID_STR_START+27) -#define STR_TOOLBAR_VISIBLE_BUTTONS (RID_STR_START+28) -#define STR_TOOLBAR_CUSTOMIZE_TOOLBAR (RID_STR_START+29) -#define STR_TOOLBAR_DOCK_TOOLBAR (RID_STR_START+30) -#define STR_TOOLBAR_DOCK_ALL_TOOLBARS (RID_STR_START+31) -#define STR_TOOLBAR_LOCK_TOOLBAR (RID_STR_START+32) -#define STR_TOOLBAR_CLOSE_TOOLBAR (RID_STR_START+33) - -#define MENUITEM_TOOLBAR_VISIBLEBUTTON 1 -#define MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR 2 -#define MENUITEM_TOOLBAR_DOCKTOOLBAR 3 -#define MENUITEM_TOOLBAR_DOCKALLTOOLBAR 4 -#define MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION 5 -#define MENUITEM_TOOLBAR_CLOSE 6 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/resource.hxx b/framework/inc/classes/resource.hxx new file mode 100644 index 000000000000..a9f98e607baa --- /dev/null +++ b/framework/inc/classes/resource.hxx @@ -0,0 +1,32 @@ +/* -*- 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_FRAMEWORK_INC_CLASSES_RESOURCE_HXX +#define INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HXX + +#define MENUITEM_TOOLBAR_VISIBLEBUTTON 1 +#define MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR 2 +#define MENUITEM_TOOLBAR_DOCKTOOLBAR 3 +#define MENUITEM_TOOLBAR_DOCKALLTOOLBAR 4 +#define MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION 5 +#define MENUITEM_TOOLBAR_CLOSE 6 + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |