include/svtools/brwbox.hxx | 13 +------------ svtools/source/brwbox/brwbox2.cxx | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-)
New commits: commit 60f612785477ab86fe580e4ba8b567a401e09985 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Thu Mar 2 08:38:55 2017 +0200 don't need this STL hack anymore Change-Id: Id0883060acf2ca73af5cce56e1cf9021c2fb121a diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 266491a..4e9f2df 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -39,7 +39,6 @@ class BrowserColumn; class BrowserDataWin; class MultiSelection; class BrowserHeader; - typedef ::std::vector< BrowserColumn* > BrowserColumns; namespace svt { @@ -372,16 +371,11 @@ protected: long CalcReverseZoom(long nVal); - inline const DataFlavorExVector& + const DataFlavorExVector& GetDataFlavors() const; bool IsDropFormatSupported( SotClipboardFormatId nFormat ); // need this because the base class' IsDropFormatSupported is not const ... -private: - const DataFlavorExVector& implGetDataFlavors() const; - // with this we can make GetDataFlavors() inline, which is strongly needed as SVTOOLS does not export - // any sysmbol containing an "_STL", so a non-inlined method would not be exported .... - protected: // callbacks for the data window virtual void ImplStartTracking(); @@ -785,11 +779,6 @@ private: }; -inline const DataFlavorExVector& BrowseBox::GetDataFlavors() const -{ - return implGetDataFlavors(); -} - #endif // INCLUDED_SVTOOLS_BRWBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 8346f0f..f623b17 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -67,7 +67,7 @@ sal_Int8 BrowseBox::ExecuteDrop( const BrowserExecuteDropEvent& ) } -const DataFlavorExVector& BrowseBox::implGetDataFlavors() const +const DataFlavorExVector& BrowseBox::GetDataFlavors() const { if (pDataWin->bCallingDropCallback) return pDataWin->GetDataFlavorExVector(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits