diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-20 22:11:32 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-20 22:47:23 -0500 |
commit | 3b3348b262eb34e15b666ba38a41fe9076942941 (patch) | |
tree | 50f4f2114e5b902fbfc8c2054cfab84cfb3c53ce /sfx2 | |
parent | Make the ctor and dtor bodies non-inline. (diff) | |
download | core-3b3348b262eb34e15b666ba38a41fe9076942941.tar.gz core-3b3348b262eb34e15b666ba38a41fe9076942941.zip |
Remove ptr_vector header exposure from sfx2/childwin.hxx public header.
Change-Id: I4060c8987a0da387d02f8468229854612a230db3
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/Library_sfx.mk | 1 | ||||
-rw-r--r-- | sfx2/source/appl/appchild.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/childwin.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/childwinimpl.cxx | 42 | ||||
-rw-r--r-- | sfx2/source/appl/childwinimpl.hxx | 42 | ||||
-rw-r--r-- | sfx2/source/inc/splitwin.hxx | 2 |
6 files changed, 89 insertions, 0 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index ae85eaaf37f2..d98e511ecc21 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -99,6 +99,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/appl/appserv \ sfx2/source/appl/appuno \ sfx2/source/appl/childwin \ + sfx2/source/appl/childwinimpl \ sfx2/source/appl/fileobj \ sfx2/source/appl/fwkhelper \ sfx2/source/appl/helpdispatch \ diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx index a0add3ebf2d9..c2730348e8b0 100644 --- a/sfx2/source/appl/appchild.cxx +++ b/sfx2/source/appl/appchild.cxx @@ -24,6 +24,7 @@ #include <sfx2/app.hxx> #include "appdata.hxx" #include "workwin.hxx" +#include "childwinimpl.hxx" #include <sfx2/childwin.hxx> #include <sfx2/templdlg.hxx> #include <sfx2/request.hxx> diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index d4821d2d92e2..1cf3fee279be 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -37,6 +37,7 @@ #include <sfx2/dockwin.hxx> #include <sfx2/dispatch.hxx> #include "workwin.hxx" +#include "childwinimpl.hxx" static const sal_uInt16 nVersion = 2; diff --git a/sfx2/source/appl/childwinimpl.cxx b/sfx2/source/appl/childwinimpl.cxx new file mode 100644 index 000000000000..5022fa58f91e --- /dev/null +++ b/sfx2/source/appl/childwinimpl.cxx @@ -0,0 +1,42 @@ +/* -*- 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 "childwinimpl.hxx" + +size_t SfxChildWinContextArr_Impl::size() const +{ + return maData.size(); +} + +const SfxChildWinContextFactory& SfxChildWinContextArr_Impl::operator []( size_t i ) const +{ + return maData[i]; +} + +SfxChildWinContextFactory& SfxChildWinContextArr_Impl::operator []( size_t i ) +{ + return maData[i]; +} + +void SfxChildWinContextArr_Impl::push_back( SfxChildWinContextFactory* p ) +{ + maData.push_back(p); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/childwinimpl.hxx b/sfx2/source/appl/childwinimpl.hxx new file mode 100644 index 000000000000..5095de408686 --- /dev/null +++ b/sfx2/source/appl/childwinimpl.hxx @@ -0,0 +1,42 @@ +/* -*- 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_CHILDWINIMPL_HXX +#define INCLUDED_SFX2_CHILDWINIMPL_HXX + +#include <sfx2/childwin.hxx> + +#include <boost/ptr_container/ptr_vector.hpp> + +class SfxChildWinContextArr_Impl +{ + typedef boost::ptr_vector<SfxChildWinContextFactory> DataType; + DataType maData; + +public: + size_t size() const; + const SfxChildWinContextFactory& operator []( size_t i ) const; + SfxChildWinContextFactory& operator []( size_t i ); + void push_back( SfxChildWinContextFactory* p ); +}; + +#endif + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index 05bbd61138a4..9e7efb2f1e39 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -22,6 +22,8 @@ #include <vcl/splitwin.hxx> #include <sfx2/childwin.hxx> +#include <boost/ptr_container/ptr_vector.hpp> + class SfxWorkWindow; class SfxDockingWindow; class SfxEmptySplitWin_Impl; |