[Libreoffice-commits] .: 2 commits - avmedia/inc avmedia/Library_avmediawin.mk

[Kohei Yoshida]

 avmedia/Library_avmediawin.mk        |    1 +
 avmedia/inc/avmedia/mediatoolbox.hxx |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b14475e64d2a06fa35ce13f8d746421454628fe8
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Mon Aug 22 20:29:20 2011 -0400

    Linker error on windows.

diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index bf09a03..bb31b38 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Library_add_linked_libs,avmediawin,\
 $(eval $(call gb_Library_add_libs,avmediawin,\
 	strmiids.lib \
 	dxguid.lib \
+	user32.lib \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,avmediawin,\
commit 030f38b59daa4a81f5c8d7a9bcf1fc84a37b42e4
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Mon Aug 22 20:18:02 2011 -0400

    Don't mark methods PUBLIC when the whole class is marked PUBLIC.
    
    MSVC refuses to compile otherwise.

diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index 2f406ca..3a34081 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -58,8 +58,8 @@ public:
 
 private:
 
-    AVMEDIA_DLLPUBLIC void implUpdateMediaControl();
-    AVMEDIA_DLLPUBLIC void implExecuteMediaControl( const MediaItem& rItem );
+    void implUpdateMediaControl();
+    void implExecuteMediaControl( const MediaItem& rItem );
 };
 
 }