From dac4ca5f682fdd0c3eee7f7ee1d98c9b3c8b7ce4 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 25 Jun 2014 14:57:44 +0200 Subject: new loplugin: externalandnotdefined Find "missing headers," where a function is declared directly in the .cxx (as extern) and not defined, and should arguably instead be declared in an include file. Change-Id: I6d83ee432b2ab0cd050aec2b27c3658d32ac02a2 --- toolkit/source/awt/vclxspinbutton.cxx | 8 +----- toolkit/source/awt/vclxwindows.cxx | 1 + toolkit/source/awt/vclxwindows_internal.hxx | 31 ++++++++++++++++++++++ .../source/controls/controlmodelcontainerbase.cxx | 4 +-- .../controlmodelcontainerbase_internal.hxx | 28 +++++++++++++++++++ toolkit/source/controls/dialogcontrol.cxx | 4 +-- 6 files changed, 63 insertions(+), 13 deletions(-) create mode 100644 toolkit/source/awt/vclxwindows_internal.hxx create mode 100644 toolkit/source/controls/controlmodelcontainerbase_internal.hxx (limited to 'toolkit') diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx index 1357673bba82..b006b15557f7 100644 --- a/toolkit/source/awt/vclxspinbutton.cxx +++ b/toolkit/source/awt/vclxspinbutton.cxx @@ -25,13 +25,7 @@ #include #include #include - -namespace toolkit -{ - void setButtonLikeFaceColor( Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue ); - ::com::sun::star::uno::Any getButtonLikeFaceColor( const Window* _pWindow ); -} - +#include "vclxwindows_internal.hxx" namespace toolkit { diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 9752b3717c12..00f7cc5042e5 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -61,6 +61,7 @@ #include "helper/accessibilityclient.hxx" #include "helper/imagealign.hxx" #include "helper/tkresmgr.hxx" +#include "vclxwindows_internal.hxx" using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/toolkit/source/awt/vclxwindows_internal.hxx b/toolkit/source/awt/vclxwindows_internal.hxx new file mode 100644 index 000000000000..6140f2050e51 --- /dev/null +++ b/toolkit/source/awt/vclxwindows_internal.hxx @@ -0,0 +1,31 @@ +/* -*- 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_TOOLKIT_SOURCE_AWT_VCLXWINDOWS_INTERNAL_HXX +#define INCLUDED_TOOLKIT_SOURCE_AWT_VCLXWINDOWS_INTERNAL_HXX + +namespace toolkit +{ + void setButtonLikeFaceColor( Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue ); + ::com::sun::star::uno::Any getButtonLikeFaceColor( const Window* _pWindow ); +} + +#endif // INCLUDED_TOOLKIT_SOURCE_AWT_VCLXWINDOWS_INTERNAL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 327dc7fd88cb..2f0726e72158 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -63,6 +63,7 @@ #include "helper/tkresmgr.hxx" #include "helper/unopropertyarrayhelper.hxx" +#include "controlmodelcontainerbase_internal.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -75,9 +76,6 @@ using namespace toolkit; #define PROPERTY_RESOURCERESOLVER OUString( "ResourceResolver" ) -//HELPER -OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); - struct LanguageDependentProp { const char* pPropName; diff --git a/toolkit/source/controls/controlmodelcontainerbase_internal.hxx b/toolkit/source/controls/controlmodelcontainerbase_internal.hxx new file mode 100644 index 000000000000..528922d5561d --- /dev/null +++ b/toolkit/source/controls/controlmodelcontainerbase_internal.hxx @@ -0,0 +1,28 @@ +/* -*- 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_TOOLKIT_SOURCE_CONTROLS_CONTROLMODELCONTAINERBASE_INTERNAL_HXX +#define INCLUDED_TOOLKIT_SOURCE_CONTROLS_CONTROLMODELCONTAINERBASE_INTERNAL_HXX + +////HELPER +OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); + +#endif // INCLUDED_TOOLKIT_SOURCE_CONTROLS_CONTROLMODELCONTAINERBASE_INTERNAL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 0faf34fb3bfc..0da0984fc12d 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -52,6 +52,7 @@ #include "toolkit/controls/unocontrols.hxx" #include "helper/unopropertyarrayhelper.hxx" +#include "controlmodelcontainerbase_internal.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -141,9 +142,6 @@ public: } }; -////HELPER -OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); - namespace { class UnoControlDialogModel : public ControlModelContainerBase -- cgit