diff options
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/inc/unotools/historyoptions_const.hxx | 56 | ||||
| -rw-r--r-- | unotools/source/config/historyoptions.cxx | 17 |
2 files changed, 16 insertions, 57 deletions
diff --git a/unotools/inc/unotools/historyoptions_const.hxx b/unotools/inc/unotools/historyoptions_const.hxx deleted file mode 100644 index 577bf935a3c6..000000000000 --- a/unotools/inc/unotools/historyoptions_const.hxx +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef INCLUDE_CONFIGITEMS_HISTORYOPTIONS_CONST_HXX -#define INCLUDE_CONFIGITEMS_HISTORYOPTIONS_CONST_HXX - -#include <rtl/ustring.hxx> - -namespace -{ - static const ::rtl::OUString s_sCommonHistory(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/History")); - static const ::rtl::OUString s_sHistories(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Histories/Histories")); - static const ::rtl::OUString s_sPickListSize(RTL_CONSTASCII_USTRINGPARAM("PickListSize")); - static const ::rtl::OUString s_sURLHistorySize(RTL_CONSTASCII_USTRINGPARAM("Size")); - static const ::rtl::OUString s_sHelpBookmarksSize(RTL_CONSTASCII_USTRINGPARAM("HelpBookmarkSize")); - static const ::rtl::OUString s_sPickList(RTL_CONSTASCII_USTRINGPARAM("PickList")); - static const ::rtl::OUString s_sURLHistory(RTL_CONSTASCII_USTRINGPARAM("URLHistory")); - static const ::rtl::OUString s_sHelpBookmarks(RTL_CONSTASCII_USTRINGPARAM("HelpBookmarks")); - static const ::rtl::OUString s_sItemList(RTL_CONSTASCII_USTRINGPARAM("ItemList")); - static const ::rtl::OUString s_sOrderList(RTL_CONSTASCII_USTRINGPARAM("OrderList")); - static const ::rtl::OUString s_sHistoryItemRef(RTL_CONSTASCII_USTRINGPARAM("HistoryItemRef")); - static const ::rtl::OUString s_sURL(RTL_CONSTASCII_USTRINGPARAM("URL")); - static const ::rtl::OUString s_sFilter(RTL_CONSTASCII_USTRINGPARAM("Filter")); - static const ::rtl::OUString s_sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")); - static const ::rtl::OUString s_sPassword(RTL_CONSTASCII_USTRINGPARAM("Password")); -} - -#endif // INCLUDE_CONFIGITEMS_HISTORYOPTIONS_CONST_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 57d490d0f29c..47a3cb0fd198 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -28,7 +28,6 @@ #include <unotools/historyoptions.hxx> -#include <unotools/historyoptions_const.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <com/sun/star/uno/Any.hxx> @@ -68,6 +67,22 @@ namespace { static const ::sal_Int32 s_nOffsetFilter = 1; static const ::sal_Int32 s_nOffsetTitle = 2; static const ::sal_Int32 s_nOffsetPassword = 3; + + static const ::rtl::OUString s_sCommonHistory(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/History")); + static const ::rtl::OUString s_sHistories(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Histories/Histories")); + static const ::rtl::OUString s_sPickListSize(RTL_CONSTASCII_USTRINGPARAM("PickListSize")); + static const ::rtl::OUString s_sURLHistorySize(RTL_CONSTASCII_USTRINGPARAM("Size")); + static const ::rtl::OUString s_sHelpBookmarksSize(RTL_CONSTASCII_USTRINGPARAM("HelpBookmarkSize")); + static const ::rtl::OUString s_sPickList(RTL_CONSTASCII_USTRINGPARAM("PickList")); + static const ::rtl::OUString s_sURLHistory(RTL_CONSTASCII_USTRINGPARAM("URLHistory")); + static const ::rtl::OUString s_sHelpBookmarks(RTL_CONSTASCII_USTRINGPARAM("HelpBookmarks")); + static const ::rtl::OUString s_sItemList(RTL_CONSTASCII_USTRINGPARAM("ItemList")); + static const ::rtl::OUString s_sOrderList(RTL_CONSTASCII_USTRINGPARAM("OrderList")); + static const ::rtl::OUString s_sHistoryItemRef(RTL_CONSTASCII_USTRINGPARAM("HistoryItemRef")); + static const ::rtl::OUString s_sURL(RTL_CONSTASCII_USTRINGPARAM("URL")); + static const ::rtl::OUString s_sFilter(RTL_CONSTASCII_USTRINGPARAM("Filter")); + static const ::rtl::OUString s_sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")); + static const ::rtl::OUString s_sPassword(RTL_CONSTASCII_USTRINGPARAM("Password")); } struct IMPL_THistoryItem |