diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 13:42:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 14:24:20 +0100 |
commit | 07f1a395098a7a3ac75eb5f05c35aa3982e33e67 (patch) | |
tree | de5521de6b2bc6c9a09ddfab61942a8e27214ebb /framework | |
parent | d9ac7def8ba320853e8865535a7a14f9af77521e (diff) |
(nearly) nothing uses GetUniqueId anymore, so remove it.
The odd one out is the usage in Formula, which attempts
to restore focus to a particular window identified by
an unique id. In this case restore focus by keeping a VclPtr
to the desired window.
Change-Id: I1dc335325c109d75745c6bba2e12662e6ae50638
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/helpid.hrc | 27 | ||||
-rw-r--r-- | framework/source/classes/resource.src | 1 | ||||
-rw-r--r-- | framework/source/uielement/macrosmenucontroller.cxx | 1 | ||||
-rw-r--r-- | framework/source/uielement/statusbarwrapper.cxx | 2 |
4 files changed, 0 insertions, 31 deletions
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc deleted file mode 100644 index 78fd95162369..000000000000 --- a/framework/inc/helpid.hrc +++ /dev/null @@ -1,27 +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_HELPID_HRC -#define INCLUDED_FRAMEWORK_HELPID_HRC - -#define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW" -#define HID_STATUSBAR "FWK_HID_STATUSBAR" - -#endif // #ifndef _FRAMEWORK_HELPID_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 52967aa2213f..74121410b513 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "helpid.hrc" #include <classes/resource.hrc> String STR_MENU_ADDONS diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index d11478e77b9a..03dfe6d1b8ef 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -34,7 +34,6 @@ #include <vcl/commandinfoprovider.hxx> #include <rtl/ustrbuf.hxx> #include "helper/mischelper.hxx" -#include "helpid.hrc" #include <osl/mutex.hxx> using namespace com::sun::star::uno; diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index d5820858060a..bf843b9cec5d 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -23,7 +23,6 @@ #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> #include <uielement/statusbar.hxx> -#include <helpid.hrc> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -114,7 +113,6 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) pStatusBarManager = new StatusBarManager( m_xContext, xFrame, pStatusBar ); static_cast<FrameworkStatusBar*>(pStatusBar)->SetStatusBarManager( pStatusBarManager ); m_xStatusBarManager.set( static_cast< OWeakObject *>( pStatusBarManager ), UNO_QUERY ); - pStatusBar->SetUniqueId( HID_STATUSBAR ); } } |