Kaydet (Commit) e59ae45f authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Forward declare all the std::vector based impl container classes.

Now #include <vector> is a goner...

Change-Id: Ia2da27bae5fadfa3f6f633e55fcedce405281b67
üst 483cff5e
......@@ -36,7 +36,6 @@
#include <vcl/svapp.hxx>
#include <sfx2/shell.hxx>
#include <vector>
class Timer;
class WorkWindow;
......@@ -61,15 +60,15 @@ class SfxMedium;
class SfxMenuCtrlFactArr_Impl;
class SfxNewFileDialog;
class SfxObjectShell;
typedef ::std::vector<SfxObjectShell*> SfxObjectShellArr_Impl;
class SfxObjectShellArr_Impl;
class SfxProgress;
class SfxSlotPool;
class SfxStbCtrlFactArr_Impl;
class SfxTbxCtrlFactArr_Impl;
class SfxViewFrame;
typedef ::std::vector<SfxViewFrame*> SfxViewFrameArr_Impl;
class SfxViewFrameArr_Impl;
class SfxViewShell;
typedef ::std::vector<SfxViewShell*> SfxViewShellArr_Impl;
class SfxViewShellArr_Impl;
class StarBASIC;
class SfxWorkWindow;
class SfxFilterMatcher;
......
......@@ -117,6 +117,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/appl/openuriexternally \
sfx2/source/appl/sfxhelp \
sfx2/source/appl/sfxpicklist \
sfx2/source/appl/shellimpl \
sfx2/source/appl/shutdownicon \
sfx2/source/appl/workwin \
sfx2/source/appl/xpackcreator \
......
......@@ -68,6 +68,7 @@
#include "helper.hxx"
#include "sfxpicklist.hxx"
#include <ctrlfactoryimpl.hxx>
#include <shellimpl.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
......
......@@ -55,6 +55,7 @@
#include "appbaslib.hxx"
#include "childwinimpl.hxx"
#include <ctrlfactoryimpl.hxx>
#include <shellimpl.hxx>
#include <basic/basicmanagerrepository.hxx>
#include <svtools/svtresid.hxx>
......
/* -*- 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 .
*/
#include <shellimpl.hxx>
SfxObjectShellArr_Impl::iterator SfxObjectShellArr_Impl::begin()
{
return maData.begin();
}
SfxObjectShellArr_Impl::iterator SfxObjectShellArr_Impl::end()
{
return maData.end();
}
const SfxObjectShell* SfxObjectShellArr_Impl::operator[] ( size_t i ) const
{
return maData[i];
}
SfxObjectShell* SfxObjectShellArr_Impl::operator[] ( size_t i )
{
return maData[i];
}
void SfxObjectShellArr_Impl::erase( iterator it )
{
maData.erase(it);
}
void SfxObjectShellArr_Impl::push_back( SfxObjectShell* p )
{
maData.push_back(p);
}
size_t SfxObjectShellArr_Impl::size() const
{
return maData.size();
}
SfxViewFrameArr_Impl::iterator SfxViewFrameArr_Impl::begin()
{
return maData.begin();
}
SfxViewFrameArr_Impl::iterator SfxViewFrameArr_Impl::end()
{
return maData.end();
}
const SfxViewFrame* SfxViewFrameArr_Impl::operator[] ( size_t i ) const
{
return maData[i];
}
SfxViewFrame* SfxViewFrameArr_Impl::operator[] ( size_t i )
{
return maData[i];
}
void SfxViewFrameArr_Impl::erase( iterator it )
{
maData.erase(it);
}
void SfxViewFrameArr_Impl::push_back( SfxViewFrame* p )
{
maData.push_back(p);
}
size_t SfxViewFrameArr_Impl::size() const
{
return maData.size();
}
SfxViewShellArr_Impl::iterator SfxViewShellArr_Impl::begin()
{
return maData.begin();
}
SfxViewShellArr_Impl::iterator SfxViewShellArr_Impl::end()
{
return maData.end();
}
const SfxViewShell* SfxViewShellArr_Impl::operator[] ( size_t i ) const
{
return maData[i];
}
SfxViewShell* SfxViewShellArr_Impl::operator[] ( size_t i )
{
return maData[i];
}
void SfxViewShellArr_Impl::erase( iterator it )
{
maData.erase(it);
}
void SfxViewShellArr_Impl::push_back( SfxViewShell* p )
{
maData.push_back(p);
}
size_t SfxViewShellArr_Impl::size() const
{
return maData.size();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -95,6 +95,7 @@
#include <sfx2/msg.hxx>
#include "appbaslib.hxx"
#include <sfx2/sfxbasemodel.hxx>
#include <shellimpl.hxx>
#include <basic/basicmanagerrepository.hxx>
......
/* -*- 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_SFX2_SHELLIMPL_HXX
#define INCLUDED_SFX2_SHELLIMPL_HXX
#include <cstdlib>
#include <vector>
class SfxObjectShell;
class SfxViewFrame;
class SfxViewShell;
class SfxObjectShellArr_Impl
{
typedef std::vector<SfxObjectShell*> DataType;
DataType maData;
public:
typedef DataType::iterator iterator;
iterator begin();
iterator end();
const SfxObjectShell* operator[] ( size_t i ) const;
SfxObjectShell* operator[] ( size_t i );
void erase( iterator it );
void push_back( SfxObjectShell* p );
size_t size() const;
};
class SfxViewFrameArr_Impl
{
typedef std::vector<SfxViewFrame*> DataType;
DataType maData;
public:
typedef DataType::iterator iterator;
iterator begin();
iterator end();
const SfxViewFrame* operator[] ( size_t i ) const;
SfxViewFrame* operator[] ( size_t i );
void erase( iterator it );
void push_back( SfxViewFrame* p );
size_t size() const;
};
class SfxViewShellArr_Impl
{
typedef std::vector<SfxViewShell*> DataType;
DataType maData;
public:
typedef DataType::iterator iterator;
iterator begin();
iterator end();
const SfxViewShell* operator[] ( size_t i ) const;
SfxViewShell* operator[] ( size_t i );
void erase( iterator it );
void push_back( SfxViewShell* p );
size_t size() const;
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -89,6 +89,7 @@
#include <svtools/svtools.hrc>
#include <svtools/svtresid.hxx>
#include <framework/framelistanalyzer.hxx>
#include <shellimpl.hxx>
#include <boost/optional.hpp>
......
......@@ -80,6 +80,7 @@
#include <sfx2/objface.hxx>
#include <sfx2/docfilt.hxx>
#include "openuriexternally.hxx"
#include <shellimpl.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment