include/sfx2/app.hxx | 16 ---------------- include/sfx2/docfile.hxx | 2 -- sfx2/Library_sfx.mk | 3 ++- sfx2/source/appl/sfxpicklist.cxx | 1 + sfx2/source/doc/sfxbasemodel.cxx | 1 + 5 files changed, 4 insertions(+), 19 deletions(-)
New commits: commit 8e206be4ed997df73ef135d20694fc512b4d3d1b Author: Kohei Yoshida <[email protected]> Date: Thu Nov 20 23:41:13 2014 -0500 Forgot to check this in. This should have been a part of the last commit. Change-Id: Id2b75e6e64b11c523ffa862f2d99bf02c2adedc5 diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index ee63e40..b2e5878 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -90,8 +90,6 @@ class ModalDialog; class SbxArray; class SbxValue; -typedef ::std::vector< SfxMedium* > SfxMediumList; - namespace sfx2 { class SvLinkSource; @@ -113,20 +111,6 @@ public: const Link& GetValue() const { return aLink; } }; -//TODO/CLEANUP -//is apparently used only in SfxPickList/SfxFrameLoader -class SfxStringHint: public SfxSimpleHint -{ - OUString aObj; - -public: - SfxStringHint( sal_uInt16 nId, const OUString& rObject ): - SfxSimpleHint( nId ), - aObj(rObject) { } - const OUString& GetObject() const { return aObj; } - virtual ~SfxStringHint() {} -}; - #ifndef SFX_DECL_OBJECTSHELL_DEFINED #define SFX_DECL_OBJECTSHELL_DEFINED typedef tools::SvRef<SfxObjectShell> SfxObjectShellRef; diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 4dd66db..92dc475 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -274,8 +274,6 @@ public: typedef tools::SvRef<SfxMedium> SfxMediumRef; -typedef ::std::vector< SfxMedium* > SfxMediumList; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index d98e511..00c8781 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -242,8 +242,9 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/menu/thessubmenu \ sfx2/source/menu/virtmenu \ sfx2/source/notify/eventsupplier \ - sfx2/source/notify/globalevents \ + sfx2/source/notify/globalevents \ sfx2/source/notify/hintpost \ + sfx2/source/notify/stringhint \ sfx2/source/sidebar/Sidebar \ sfx2/source/sidebar/SidebarChildWindow \ sfx2/source/sidebar/SidebarDockingWindow \ diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 0a6959f..1c2cf0a 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -48,6 +48,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> #include "objshimp.hxx" +#include <stringhint.hxx> #include <sfx2/docfilt.hxx> #include <rtl/instance.hxx> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index cbefd53..7e34a7b 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -110,6 +110,7 @@ #include <sfx2/brokenpackageint.hxx> #include "graphhelp.hxx" #include "docundomanager.hxx" +#include <stringhint.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/DocumentMetadataAccess.hxx> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
