Author: pfg
Date: Sat Dec 17 22:54:05 2016
New Revision: 1774812
URL: http://svn.apache.org/viewvc?rev=1774812&view=rev
Log:
Revert SVN r1774747:
Requested by: damjan
Added:
openoffice/trunk/main/avmedia/source/framework/makefile.mk
- copied unchanged from r1774746,
openoffice/trunk/main/avmedia/source/framework/makefile.mk
openoffice/trunk/main/avmedia/source/gstreamer/exports.dxp
- copied unchanged from r1774746,
openoffice/trunk/main/avmedia/source/gstreamer/exports.dxp
openoffice/trunk/main/avmedia/source/gstreamer/makefile.mk
- copied unchanged from r1774746,
openoffice/trunk/main/avmedia/source/gstreamer/makefile.mk
openoffice/trunk/main/avmedia/source/java/makefile.mk
- copied unchanged from r1774746,
openoffice/trunk/main/avmedia/source/java/makefile.mk
openoffice/trunk/main/avmedia/source/macavf/makefile.mk
- copied unchanged from r1774746,
openoffice/trunk/main/avmedia/source/macavf/makefile.mk
openoffice/trunk/main/avmedia/source/quicktime/makefile.mk
- copied unchanged from r1774746,
openoffice/trunk/main/avmedia/source/quicktime/makefile.mk
openoffice/trunk/main/avmedia/source/viewer/makefile.mk
- copied unchanged from r1774746,
openoffice/trunk/main/avmedia/source/viewer/makefile.mk
openoffice/trunk/main/avmedia/source/win/exports.dxp
- copied unchanged from r1774746,
openoffice/trunk/main/avmedia/source/win/exports.dxp
openoffice/trunk/main/avmedia/source/win/makefile.mk
- copied unchanged from r1774746,
openoffice/trunk/main/avmedia/source/win/makefile.mk
openoffice/trunk/main/avmedia/util/makefile.mk
- copied unchanged from r1774746,
openoffice/trunk/main/avmedia/util/makefile.mk
Removed:
openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk
openoffice/trunk/main/avmedia/Jar_avmedia.mk
openoffice/trunk/main/avmedia/Library_avmedia.mk
openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk
openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk
openoffice/trunk/main/avmedia/Library_avmediagst.mk
openoffice/trunk/main/avmedia/Library_avmediawin.mk
openoffice/trunk/main/avmedia/Makefile
openoffice/trunk/main/avmedia/Module_avmedia.mk
openoffice/trunk/main/avmedia/Package_avmedia_jar.mk
openoffice/trunk/main/avmedia/Package_inc.mk
openoffice/trunk/main/avmedia/inc/avmedia/avmediadllapi.h
openoffice/trunk/main/avmedia/prj/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/avmedia/inc/avmedia/mediaitem.hxx
openoffice/trunk/main/avmedia/inc/avmedia/mediaplayer.hxx
openoffice/trunk/main/avmedia/inc/avmedia/mediatoolbox.hxx
openoffice/trunk/main/avmedia/inc/avmedia/mediawindow.hxx
openoffice/trunk/main/avmedia/prj/build.lst
openoffice/trunk/main/avmedia/prj/d.lst
openoffice/trunk/main/avmedia/source/framework/soundhandler.cxx
openoffice/trunk/main/avmedia/source/gstreamer/gstuno.cxx
openoffice/trunk/main/avmedia/source/macavf/macavf_macavfuno.cxx
openoffice/trunk/main/avmedia/source/quicktime/qt_uno.cxx
openoffice/trunk/main/avmedia/source/win/winuno.cxx
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Sat Dec 17 22:54:05 2016
@@ -26,7 +26,6 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
MathMLDTD \
animations \
- avmedia \
basebmp \
basegfx \
binaryurp \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Sat Dec 17 22:54:05 2016
@@ -46,10 +46,6 @@ $(eval $(call gb_Helper_register_librari
agg \
animcore \
avmedia \
- avmediagst \
- avmediaMacAVF \
- avmediaQuickTime \
- avmediawin \
basebmp \
basegfx \
canvastools \
Modified: openoffice/trunk/main/avmedia/inc/avmedia/mediaitem.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/inc/avmedia/mediaitem.hxx?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/inc/avmedia/mediaitem.hxx (original)
+++ openoffice/trunk/main/avmedia/inc/avmedia/mediaitem.hxx Sat Dec 17 22:54:05
2016
@@ -29,7 +29,6 @@
#include <svl/poolitem.hxx>
#endif
#include <com/sun/star/media/ZoomLevel.hpp>
-#include <avmedia/avmediadllapi.h>
#define AVMEDIA_SETMASK_NONE ((sal_uInt32)(0x00000000))
#define AVMEDIA_SETMASK_STATE ((sal_uInt32)(0x00000001))
@@ -63,7 +62,7 @@ enum MediaState
// - MediaItem -
// -------------
-class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem
+class MediaItem : public SfxPoolItem
{
public:
TYPEINFO();
Modified: openoffice/trunk/main/avmedia/inc/avmedia/mediaplayer.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/inc/avmedia/mediaplayer.hxx?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/inc/avmedia/mediaplayer.hxx (original)
+++ openoffice/trunk/main/avmedia/inc/avmedia/mediaplayer.hxx Sat Dec 17
22:54:05 2016
@@ -27,7 +27,6 @@
#include <sfx2/ctrlitem.hxx>
#include <sfx2/dockwin.hxx>
#include <tools/urlobj.hxx>
-#include <avmedia/avmediadllapi.h>
// -----------
// - Defines -
@@ -46,7 +45,7 @@ namespace avmedia
// - MediaPlayer -
// ---------------
-class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow
+class MediaPlayer : public SfxChildWindow
{
public:
MediaPlayer( Window*,
sal_uInt16, SfxBindings*, SfxChildWinInfo* );
@@ -61,7 +60,7 @@ public:
class MediaWindow;
-class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow
+class MediaFloater : public SfxDockingWindow
{
public:
Modified: openoffice/trunk/main/avmedia/inc/avmedia/mediatoolbox.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/inc/avmedia/mediatoolbox.hxx?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/inc/avmedia/mediatoolbox.hxx (original)
+++ openoffice/trunk/main/avmedia/inc/avmedia/mediatoolbox.hxx Sat Dec 17
22:54:05 2016
@@ -26,7 +26,6 @@
#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
-#include <avmedia/avmediadllapi.h>
namespace avmedia
{
@@ -37,7 +36,7 @@ namespace avmedia
class MediaItem;
-class AVMEDIA_DLLPUBLIC MediaToolBoxControl : public SfxToolBoxControl
+class MediaToolBoxControl : public SfxToolBoxControl
{
friend class MediaToolBoxControl_Impl;
Modified: openoffice/trunk/main/avmedia/inc/avmedia/mediawindow.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/inc/avmedia/mediawindow.hxx?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/inc/avmedia/mediawindow.hxx (original)
+++ openoffice/trunk/main/avmedia/inc/avmedia/mediawindow.hxx Sat Dec 17
22:54:05 2016
@@ -31,7 +31,6 @@
#include <com/sun/star/media/XPlayer.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/uno/XInterface.hpp>
-#include <avmedia/avmediadllapi.h>
// -----------
// - Defines -
@@ -68,7 +67,7 @@ namespace avmedia
// - MediaWindow -
// ---------------
- class AVMEDIA_DLLPUBLIC MediaWindow
+ class MediaWindow
{
public:
MediaWindow( Window* parent, bool
bInternalMediaControl );
Modified: openoffice/trunk/main/avmedia/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/prj/build.lst?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/prj/build.lst (original)
+++ openoffice/trunk/main/avmedia/prj/build.lst Sat Dec 17 22:54:05 2016
@@ -1,2 +1,12 @@
av avmedia : L10N:l10n tools sfx2 LIBXSLT:libxslt NULL
-av avmedia\prj nmake - all av_prj
NULL
+av avmedia usr1 - all av_mkout
NULL
+av avmedia\prj get -
all av_prj
NULL
+av avmedia\inc get -
all av_inv
NULL
+av avmedia\source\viewer nmake - all av_viewer
NULL
+av avmedia\source\framework nmake - all av_framework
NULL
+av avmedia\source\win nmake - all av_win
NULL
+av avmedia\source\java nmake - all av_java
NULL
+av avmedia\source\quicktime nmake - all av_quicktime
NULL
+av avmedia\source\macavf nmake - all av_macavf
NULL
+av avmedia\source\gstreamer nmake - all av_gstreamer
NULL
+av avmedia\util nmake - all av_util
av_viewer av_framework av_win av_java av_quicktime av_gstreamer NULL
Modified: openoffice/trunk/main/avmedia/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/prj/d.lst?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/prj/d.lst (original)
+++ openoffice/trunk/main/avmedia/prj/d.lst Sat Dec 17 22:54:05 2016
@@ -0,0 +1,25 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\bin\avmedia*.dll %_DEST%\bin%_EXT%\avmedia*.dll
+..\source\java\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
+..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
+..\%__SRC%\bin\avmedia*.res %_DEST%\bin%_EXT%\avmedia*.res
+
+mkdir: %_DEST%\inc%_EXT%\avmedia
+
+..\inc\avmedia\mediawindow.hxx %_DEST%\inc%_EXT%\avmedia\mediawindow.hxx
+..\inc\avmedia\mediaitem.hxx %_DEST%\inc%_EXT%\avmedia\mediaitem.hxx
+..\inc\avmedia\mediaplayer.hxx %_DEST%\inc%_EXT%\avmedia\mediaplayer.hxx
+..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx
+
+..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
+..\%__SRC%\misc\avmedia.component %_DEST%\xml%_EXT%\avmedia.component
+..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml%_EXT%\avmedia.jar.component
+..\%__SRC%\misc\avmediaQuickTime.component
%_DEST%\xml%_EXT%\avmediaQuickTime.component
+..\%__SRC%\misc\avmediaMacAVF.component
%_DEST%\xml%_EXT%\avmediaMacAVF.component
+..\%__SRC%\misc\avmediagst.component %_DEST%\xml%_EXT%\avmediagst.component
+..\%__SRC%\misc\avmediawin.component %_DEST%\xml%_EXT%\avmediawin.component
+
Modified: openoffice/trunk/main/avmedia/source/framework/soundhandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/framework/soundhandler.cxx?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/framework/soundhandler.cxx (original)
+++ openoffice/trunk/main/avmedia/source/framework/soundhandler.cxx Sat Dec 17
22:54:05 2016
@@ -488,7 +488,7 @@ IMPL_LINK( SoundHandler, implts_PlayerNo
// - component_getImplementationEnvironment -
// ------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName,
uno_Environment ** /*ppEnv*/ )
+extern "C" void SAL_CALL component_getImplementationEnvironment( const
sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -497,7 +497,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL
// - component_getFactory -
// ------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const
sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" void* SAL_CALL component_getFactory(const sal_Char*
pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
{
void* pReturn = NULL;
if (pServiceManager != NULL )
Modified: openoffice/trunk/main/avmedia/source/gstreamer/gstuno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/gstreamer/gstuno.cxx?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/gstreamer/gstuno.cxx (original)
+++ openoffice/trunk/main/avmedia/source/gstreamer/gstuno.cxx Sat Dec 17
22:54:05 2016
@@ -39,7 +39,7 @@ static uno::Reference< uno::XInterface >
// - component_getImplementationEnvironment -
// ------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName,
uno_Environment ** /* ppEnv */ )
+extern "C" void SAL_CALL component_getImplementationEnvironment( const
sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -48,7 +48,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL
// - component_getFactory -
// ------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const
sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName,
void* pServiceManager, void* /* pRegistryKey */ )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void*
pRet = 0;
Modified: openoffice/trunk/main/avmedia/source/macavf/macavf_macavfuno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/macavf/macavf_macavfuno.cxx?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/macavf/macavf_macavfuno.cxx (original)
+++ openoffice/trunk/main/avmedia/source/macavf/macavf_macavfuno.cxx Sat Dec 17
22:54:05 2016
@@ -36,7 +36,7 @@ static uno::Reference< uno::XInterface >
// - component_getImplementationEnvironment -
// ------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName,
uno_Environment ** /* ppEnv */ )
+extern "C" void SAL_CALL component_getImplementationEnvironment( const
sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -45,7 +45,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL
// - component_getFactory -
// ------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const
sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName,
void* pServiceManager, void* /* pRegistryKey */ )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void*
pRet = 0;
Modified: openoffice/trunk/main/avmedia/source/quicktime/qt_uno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/quicktime/qt_uno.cxx?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/quicktime/qt_uno.cxx (original)
+++ openoffice/trunk/main/avmedia/source/quicktime/qt_uno.cxx Sat Dec 17
22:54:05 2016
@@ -36,7 +36,7 @@ static uno::Reference< uno::XInterface >
// - component_getImplementationEnvironment -
// ------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName,
uno_Environment ** /* ppEnv */ )
+extern "C" void SAL_CALL component_getImplementationEnvironment( const
sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -45,7 +45,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL
// - component_getFactory -
// ------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const
sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName,
void* pServiceManager, void* /* pRegistryKey */ )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void*
pRet = 0;
Modified: openoffice/trunk/main/avmedia/source/win/winuno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/win/winuno.cxx?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/win/winuno.cxx (original)
+++ openoffice/trunk/main/avmedia/source/win/winuno.cxx Sat Dec 17 22:54:05 2016
@@ -39,7 +39,7 @@ static uno::Reference< uno::XInterface >
// - component_getImplementationEnvironment -
// ------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName,
uno_Environment ** )
+extern "C" void SAL_CALL component_getImplementationEnvironment( const
sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -48,7 +48,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL
// - component_getFactory -
// ------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const
sal_Char* pImplName, void* pServiceManager, void* )
+extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName,
void* pServiceManager, void* )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void*
pRet = 0;
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1774812&r1=1774811&r2=1774812&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Sat Dec 17
22:54:05 2016
@@ -47,6 +47,7 @@ my_components = \
stocservices \
abp \
analysis \
+ avmedia \
basctl \
basprov \
bib \
@@ -57,7 +58,6 @@ my_components = \
charttools \
chartview \
component/animations/source/animcore/animcore \
- component/avmedia/util/avmedia \
component/binaryurp/source/binaryurp \
component/canvas/source/factory/canvasfactory \
component/canvas/source/simplecanvas/simplecanvas \
@@ -315,8 +315,8 @@ my_components += \
.IF "$(OS)" == "MACOSX"
my_components += \
- component/avmedia/source/macavf/avmediaMacAVF \
- component/avmedia/source/quicktime/avmediaQuickTime \
+ avmediaQuickTime \
+ avmediaMacAVF \
fps_aqua \
macab1 \
macbe1 \
@@ -352,7 +352,7 @@ my_components += \
.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
my_components += \
- component/avmedia/source/win/avmediawin \
+ avmediawin \
component/canvas/source/directx/directx9canvas \
component/canvas/source/directx/gdipluscanvas
.END
@@ -387,11 +387,11 @@ my_components += evoab
.END
.IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
-my_components += component/avmedia/source/gstreamer/avmediagst
+my_components += avmediagst
.END
.IF "$(OS)" != "WNT" && "$(SOLAR_JAVA)" == "TRUE"
-my_components += component/avmedia/source/java/avmedia.jar
+my_components += avmedia.jar
.END
my_ooo_components = mailmerge
