diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-25 14:57:44 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-07-11 14:12:25 +0200 |
commit | dac4ca5f682fdd0c3eee7f7ee1d98c9b3c8b7ce4 (patch) | |
tree | f0f66445c3f396759c41d7e3294e728653dbfa88 /vcl | |
parent | 28b6325901138a6267320902ec889fc434ddde91 (diff) |
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
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/salinst.hxx | 2 | ||||
-rw-r--r-- | vcl/osx/salinst.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/svmainhook.cxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 1 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter2.cxx | 5 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter_internal.hxx (renamed from vcl/inc/svmain.hxx) | 13 | ||||
-rw-r--r-- | vcl/source/salmain/salmain.cxx | 1 | ||||
-rw-r--r-- | vcl/source/window/dlgctrl.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/dlgctrl.hxx | 37 | ||||
-rw-r--r-- | vcl/source/window/legacyaccessibility.cxx | 12 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_im.cxx | 3 |
12 files changed, 55 insertions, 29 deletions
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index b7d199373475..3713c7f7f1fa 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -193,8 +193,6 @@ void DeInitSalData(); // called from Application-Dtor void InitSalMain(); -VCL_DLLPUBLIC int SVMain(); - #endif // INCLUDED_VCL_INC_SALINST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 3104733c0cdc..f88bf7917279 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -30,6 +30,7 @@ #include "vcl/svapp.hxx" #include "vcl/window.hxx" #include "vcl/timer.hxx" +#include "vcl/svmain.hxx" #include "osx/saldata.hxx" #include "osx/salinst.h" @@ -46,7 +47,6 @@ #include "print.h" #include "impbmp.hxx" #include "salimestatus.hxx" -#include "svmain.hxx" #include <comphelper/processfactory.hxx> diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 0acb009292a5..6c287551da4f 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -57,7 +57,7 @@ #include "salinst.hxx" #include "salwtype.hxx" #include "svdata.hxx" -#include "svmain.hxx" +#include "vcl/svmain.hxx" #include "dbggui.hxx" #include "accmgr.hxx" #include "idlemgr.hxx" diff --git a/vcl/source/app/svmainhook.cxx b/vcl/source/app/svmainhook.cxx index 4974cff72057..a66bbc186f92 100644 --- a/vcl/source/app/svmainhook.cxx +++ b/vcl/source/app/svmainhook.cxx @@ -19,7 +19,7 @@ #include <sal/config.h> -#include <svmain.hxx> +#include <vcl/svmain.hxx> #ifndef MACOSX // MacOSX implementation of ImplSVMainHook is in osx/salinst.cxx diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 951258ebd2f3..9c69d980712a 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -67,6 +67,7 @@ #include <boost/scoped_ptr.hpp> #include "FilterConfigCache.hxx" +#include "graphicfilter_internal.hxx" #define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 192a07525aca..a2bf39b7a58a 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -23,11 +23,10 @@ #include <vcl/outdev.hxx> #include <vcl/graphicfilter.hxx> #include <unotools/ucbstreamhelper.hxx> +#include "graphicfilter_internal.hxx" #define DATA_SIZE 640 -sal_uInt8* ImplSearchEntry( sal_uInt8* , sal_uInt8* , sal_uLong , sal_uLong ); - GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) : pFileStm( ::utl::UcbStreamHelper::CreateStream( rPath.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ) ), aPathExt( rPath.GetFileExtension().toAsciiLowerCase() ), @@ -941,8 +940,6 @@ bool GraphicDescriptor::ImpDetectMET( SvStream&, bool ) return bRet; } -extern bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen); - bool GraphicDescriptor::ImpDetectPCT( SvStream& rStm, bool ) { bool bRet = aPathExt.startsWith( "pct" ); diff --git a/vcl/inc/svmain.hxx b/vcl/source/filter/graphicfilter_internal.hxx index 6ea93fa4d5dc..3e27c30aa62b 100644 --- a/vcl/inc/svmain.hxx +++ b/vcl/source/filter/graphicfilter_internal.hxx @@ -17,14 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_SVMAIN_HXX -#define INCLUDED_VCL_INC_SVMAIN_HXX +#ifndef INCLUDED_VCL_SOURCE_FILTER_GRAPHICFILTER_INTERNAL_HXX +#define INCLUDED_VCL_SOURCE_FILTER_GRAPHICFILTER_INTERNAL_HXX -#include <sal/config.h> +#include "tools/solar.h" -// #i47888# allow for alternative initialization as required for e.g. MacOSX -bool ImplSVMainHook( int* ); +sal_uInt8* ImplSearchEntry( sal_uInt8* , sal_uInt8* , sal_uLong , sal_uLong ); -#endif +extern bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen); + +#endif // INCLUDED_VCL_SOURCE_FILTER_GRAPHICFILTER_INTERNAL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx index 13cd13fe4f99..7f0f90af0515 100644 --- a/vcl/source/salmain/salmain.cxx +++ b/vcl/source/salmain/salmain.cxx @@ -24,6 +24,7 @@ #include "sal/main.h" #include "tools/extendapplicationenvironment.hxx" #include "vcl/vclmain.hxx" +#include "vcl/svmain.hxx" #include "salinst.hxx" diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index b1bc2612bc4b..7b4ca2a6f5a7 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -20,8 +20,8 @@ #include <tools/debug.hxx> #include <svdata.hxx> -#include <window.h> +#include <dlgctrl.hxx> #include <vcl/event.hxx> #include <vcl/fixed.hxx> #include <vcl/layout.hxx> @@ -379,7 +379,7 @@ Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIn } Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, - sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true ) + sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable ) { DBG_ASSERT( (rIndex >= nFormStart) && (rIndex <= nFormEnd), "Window::ImplFindAccelWindow() - rIndex not in Form" ); diff --git a/vcl/source/window/dlgctrl.hxx b/vcl/source/window/dlgctrl.hxx new file mode 100644 index 000000000000..06c16b3b8076 --- /dev/null +++ b/vcl/source/window/dlgctrl.hxx @@ -0,0 +1,37 @@ +/* -*- 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_VCL_SOURCE_WINDOW_DLGCTRL_HXX +#define INCLUDED_VCL_SOURCE_WINDOW_DLGCTRL_HXX + +#include <window.h> + +Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ); + +Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIndex, + sal_uInt16& rFormStart, sal_uInt16& rFormEnd ); + +Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, + sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true ); + +sal_Unicode getAccel( const OUString& rStr ); + +#endif // INCLUDED_VCL_SOURCE_WINDOW_DLGCTRL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/legacyaccessibility.cxx b/vcl/source/window/legacyaccessibility.cxx index 4186d53cef83..5dc37d1846f0 100644 --- a/vcl/source/window/legacyaccessibility.cxx +++ b/vcl/source/window/legacyaccessibility.cxx @@ -20,8 +20,8 @@ #include <tools/debug.hxx> #include <svdata.hxx> -#include <window.h> +#include <dlgctrl.hxx> #include <vcl/event.hxx> #include <vcl/fixed.hxx> #include <vcl/layout.hxx> @@ -38,16 +38,6 @@ using namespace ::com::sun::star; -Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ); - -Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIndex, - sal_uInt16& rFormStart, sal_uInt16& rFormEnd ); - -Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, - sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true ); - -sal_Unicode getAccel( const OUString& rStr ); - static Window* ImplGetLabelFor( Window* pFrameWindow, WindowType nMyType, Window* pLabel, sal_Unicode nAccel ) { Window* pWindow = NULL; diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 4137e4b66078..7e1587386546 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -41,9 +41,10 @@ #include <osl/thread.h> #include <osl/process.h> -using namespace vcl; #include "unx/i18n_cb.hxx" +using namespace vcl; + // kinput2 IME needs special key handling since key release events are filtered in // preeditmode and XmbResetIC does not work |