Clean up function declarations and some unused functions

Change-Id: If2c233a8ced8815b065a72caff907f10ef6166ff

9 files changed, 86 insertions, 17 deletions

diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 866949d4d00d..d3f127cf98ae 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -24,6 +24,7 @@
 
 #include "drawview.hxx"
 #include "drwlayer.hxx"
+#include "imapwrap.hxx"
 #include "viewdata.hxx"
 #include "dbfunc.hxx"
 #include "document.hxx"
@@ -31,12 +32,6 @@
 #include "tabvwsh.hxx"
 #include "docsh.hxx"
 
-void ScIMapDlgSet( const Graphic& rGraphic, const ImageMap* pImageMap,
-                    const TargetList* pTargetList, void* pEditingObj );     // imapwrap
-sal_uInt16 ScIMapChildWindowId();
-
-// STATIC DATA -----------------------------------------------------------
-
 ScDrawView::ScDrawView( OutputDevice* pOut, ScViewData* pData ) :
     FmFormView( pData->GetDocument()->GetDrawLayer(), pOut ),
     pViewData( pData ),
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 8958b81464d0..06b54bb8dff5 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -225,7 +225,6 @@ public:
     SCCOL           GetCol() const          { return nCol; }
     SCROW           GetRow() const          { return nRow; }
     ScFilterBoxMode GetMode() const         { return eMode; }
-    sal_Bool            IsDataSelect() const    { return (eMode == SC_FILTERBOX_DATASELECT); }
     void            EndInit();
     sal_Bool            IsInInit() const        { return bInit; }
     void            SetCancelled()          { bCancelled = sal_True; }
diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx
index e648ffaf1b27..38a00269024e 100644
--- a/sc/source/ui/view/imapwrap.cxx
+++ b/sc/source/ui/view/imapwrap.cxx
@@ -20,6 +20,7 @@
 #include <svx/imapdlg.hxx>
 #include <sfx2/viewfrm.hxx>
 
+#include <imapwrap.hxx>
 
 sal_uInt16 ScIMapChildWindowId()
 {
diff --git a/sc/source/ui/view/imapwrap.hxx b/sc/source/ui/view/imapwrap.hxx
new file mode 100644
index 000000000000..9e195b9393d9
--- /dev/null
+++ b/sc/source/ui/view/imapwrap.hxx
@@ -0,0 +1,46 @@
+/* -*- 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_SC_SOURCE_UI_VIEW_IMAPWRAP_HXX
+#define INCLUDED_SC_SOURCE_UI_VIEW_IMAPWRAP_HXX
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+#include <sfx2/frame.hxx>
+
+class Graphic;
+class ImageMap;
+class SvxIMapDlg;
+
+SvxIMapDlg * ScGetIMapDlg();
+
+sal_uInt16 ScIMapChildWindowId();
+
+ImageMap const & ScIMapDlgGetMap(SvxIMapDlg * pDlg);
+
+void const * ScIMapDlgGetObj(SvxIMapDlg * pDlg);
+
+void ScIMapDlgSet(
+    Graphic const & rGraphic, ImageMap const * pImageMap,
+    TargetList const * pTargetList, void * pEditingObj);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx
index 2f79de731f8a..17e98b13a90b 100644
--- a/sc/source/ui/view/olkact.cxx
+++ b/sc/source/ui/view/olkact.cxx
@@ -25,6 +25,7 @@
 #include "drawview.hxx"
 #include "drawpage.hxx"
 #include "drwlayer.hxx"
+#include "olkact.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sc/source/ui/view/olkact.hxx b/sc/source/ui/view/olkact.hxx
new file mode 100644
index 000000000000..3ca261e7f34a
--- /dev/null
+++ b/sc/source/ui/view/olkact.hxx
@@ -0,0 +1,33 @@
+/* -*- 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_SC_SOURCE_UI_VIEW_OLKACT_HXX
+#define INCLUDED_SC_SOURCE_UI_VIEW_OLKACT_HXX
+
+#include <sal/config.h>
+
+class ScViewData;
+
+void ActivateOlk(ScViewData * pViewData);
+
+void DeActivateOlk(ScViewData * pViewData);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index c4b76cfc7eb8..4b99bcbb8e56 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -141,12 +141,10 @@ public:
     void SetTextToWidthOrHash( ScRefCellValue& rCell, long nWidth );
     void        SetAutoText( const OUString& rAutoText );
 
-    const ScPatternAttr*    GetPattern() const       { return pPattern; }
     SvxCellOrientation      GetOrient() const        { return eAttrOrient; }
     SvxCellHorJustify       GetHorJust() const       { return eAttrHorJust; }
     SvxCellVerJustify       GetVerJust() const       { return eAttrVerJust; }
     SvxCellJustifyMethod    GetHorJustMethod() const { return eAttrHorJustMethod; }
-    SvxCellJustifyMethod    GetVerJustMethod() const { return eAttrVerJustMethod; }
     const SvxMarginItem*    GetMargin() const        { return pMargin; }
 
     sal_uInt16              GetLeftTotal() const     { return pMargin->GetLeftMargin() + nIndent; }
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 4c0f3742f6fb..955d9bffe080 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include "olkact.hxx"
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
 
@@ -88,9 +91,6 @@
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
-void ActivateOlk( ScViewData* pViewData );
-void DeActivateOlk( ScViewData* pViewData );
-
 extern SfxViewShell* pScActiveViewShell;            // global.cxx
 
 using namespace com::sun::star;
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index d6b7fd9341de..0718edd0f795 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -28,6 +28,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svl/whiter.hxx>
 
+#include "imapwrap.hxx"
 #include "tabvwsh.hxx"
 #include "viewdata.hxx"
 #include "tabview.hxx"
@@ -40,11 +41,6 @@
 
 class SvxIMapDlg;
 
-sal_uInt16          ScIMapChildWindowId();
-SvxIMapDlg*     ScGetIMapDlg();
-const void*     ScIMapDlgGetObj( SvxIMapDlg* pDlg );
-const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg );
-
 void ScTabViewShell::ExecChildWin(SfxRequest& rReq)
 {
     sal_uInt16 nSlot = rReq.GetSlot();