Libreoffice 5 0 5

.buckconfig

@@ -0,0 +1,13 @@
+[alias]
+  api = //:api
+  api_install = //solenv/maven:api_install
+  api_deploy = //solenv/maven:api_deploy
+
+[buildfile]
+  includes = //solenv/buck/build.defs
+
+[project]
+  ignore = .git,workdir,instdir
+
+[cache]
+  mode = dir

.buckversion

@@ -0,0 +1 @@
+6659a474fb2ba6e921bb38c1b55d4c9ba6073cfa

.gitignore

@@ -20,6 +20,7 @@
 #
 
 # where stuff is built
+/buck-out
 /instdir
 /instdir_for_build
 /workdir
@@ -76,6 +77,7 @@
 \#*
 *.kdev4
 .kdev_include_paths
+.buckd
 .directory
 
 # things below this point are targeted for elimination

.gitreview

@@ -3,5 +3,5 @@ host=logerrit
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=master
+defaultbranch=libreoffice-5-0-5
 

BUCK

@@ -0,0 +1,59 @@
+prebuilt_jar(
+  name = 'juh',
+  binary_jar = 'instdir/program/classes/juh.jar',
+  visibility = ['PUBLIC'],
+)
+
+prebuilt_jar(
+  name = 'jurt',
+  binary_jar = 'instdir/program/classes/jurt.jar',
+  visibility = ['PUBLIC'],
+)
+
+prebuilt_jar(
+  name = 'officebean',
+  binary_jar = 'instdir/program/classes/officebean.jar',
+  visibility = ['PUBLIC'],
+)
+
+prebuilt_jar(
+  name = 'ridl',
+  binary_jar = 'instdir/program/classes/ridl.jar',
+  visibility = ['PUBLIC'],
+)
+
+prebuilt_jar(
+  name = 'unoil',
+  binary_jar = 'instdir/program/classes/unoil.jar',
+  visibility = ['PUBLIC'],
+)
+
+prebuilt_jar(
+  name = 'unoloader',
+  binary_jar = 'instdir/program/classes/unoloader.jar',
+  visibility = ['PUBLIC'],
+)
+
+zip_file(
+  name = 'api',
+  srcs = [
+   ':juh',
+   '//javaunohelper:juh-src',
+   '//javaunohelper:juh-javadoc',
+   ':jurt',
+   '//jurt:jurt-src',
+   '//jurt:jurt-javadoc',
+   ':officebean',
+   '//bean:officebean-src',
+   '//bean:officebean-javadoc',
+   ':ridl',
+   '//ridljar:ridl-src',
+   '//ridljar:ridl-javadoc',
+   ':unoil',
+   '//unoil:unoil-src',
+   '//unoil:unoil-javadoc',
+   ':unoloader',
+   '//ridljar/source/unoloader:unoloader-src',
+   '//ridljar/source/unoloader:unoloader-javadoc',
+  ]
+)

Library_merged.mk

@@ -36,6 +36,8 @@ $(eval $(call gb_Library_add_ldflags,merged,\
 	/ignore:4049 \
 	/ignore:4217 \
 ))
+# cursors
+$(eval $(call gb_Library_add_nativeres,merged,vcl/salsrc))
 endif
 
 ifeq ($(OS),MACOSX)

Repository.mk

@@ -414,6 +414,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(if $(ENABLE_TELEPATHY),tubes) \
 	ucpexpand1 \
 	ucpext \
+	ucpimage \
 	ucpcmis1 \
 	ucptdoc1 \
 	unordf \

RepositoryExternal.mk

@@ -132,7 +132,7 @@ endef
 else # !SYSTEM_MDDS
 
 define gb_ExternalProject__use_mdds_headers
-$(call gb_ExternalProject_use_external_project,$(1),mdds)
+$(call gb_ExternalProject_use_unpacked,$(1),mdds)
 
 endef
 
@@ -3170,6 +3170,11 @@ endef
 
 define gb_LinkTarget__use_python
 $(call gb_LinkTarget__use_python_headers,$(1))
+ifeq ($(OS),MACOSX)
+$(call gb_LinkTarget_use_generated_package,$(1),python3)
+else
+$(call gb_LinkTarget_use_package,$(1),python3)
+endif
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\

accessibility/source/extended/listboxaccessible.cxx

@@ -19,6 +19,7 @@
 
 #include <accessibility/extended/listboxaccessible.hxx>
 #include <svtools/treelistbox.hxx>
+#include <vcl/svapp.hxx>
 
 namespace accessibility
 {
@@ -55,6 +56,7 @@ namespace accessibility
 
     void ListBoxAccessibleBase::disposing()
     {
+        SolarMutexGuard g;
         if ( m_pWindow )
             m_pWindow->RemoveEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
         m_pWindow = NULL;

accessibility/source/standard/vclxaccessibletabcontrol.cxx

@@ -377,10 +377,9 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32
     Reference< XAccessible > xChild = m_aAccessibleChildren[i];
     if ( !xChild.is() )
     {
-        if ( m_pTabControl )
+        sal_uInt16 nPageId = m_pTabControl ? m_pTabControl->GetPageId((sal_uInt16)i) : 0;
+        if (nPageId)
         {
-            sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i );
-
             xChild = new VCLXAccessibleTabPage( m_pTabControl, nPageId );
 
             // insert into tab page list

avmedia/Library_avmediagst.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\
 	cppu \
 	cppuhelper \
 	sal \
+	salhelper \
 	tl \
 	vcl \
 	$(gb_UWINAPI) \

avmedia/Library_avmediagst_0_10.mk

@@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\
 	cppu \
 	cppuhelper \
 	sal \
+	salhelper \
 	tl \
 	vcl \
 	$(gb_UWINAPI) \

avmedia/source/framework/mediacontrol.cxx

@@ -605,7 +605,6 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
 IMPL_LINK_NOARG_TYPED(MediaControl, implTimeoutHdl, Idle *, void)
 {
     update();
-    maIdle.Start();
 }
 
 }

avmedia/source/framework/mediaplayer.cxx

@@ -101,12 +101,16 @@ void MediaFloater::ToggleFloatingMode()
 {
     ::avmedia::MediaItem aRestoreItem;
 
-    mpMediaWindow->updateMediaItem( aRestoreItem );
+    if (mpMediaWindow)
+        mpMediaWindow->updateMediaItem( aRestoreItem );
     delete mpMediaWindow;
     mpMediaWindow = NULL;
 
     SfxDockingWindow::ToggleFloatingMode();
 
+    if (isDisposed())
+        return;
+
     mpMediaWindow = new MediaWindow( this, true );
 
     mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );