avmedia/source/avmediadummy.cxx | 5 +++++
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 15b7cdb35d080a8cbeb844dc4102ef0b7b172d3d
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Tue Aug 28 11:17:24 2018 +0300
Commit: Tor Lillqvist <t...@iki.fi>
CommitDate: Tue Aug 28 11:18:27 2018 +0300
Add getMaskSet() to the dummy AVMediaSetMask
As such I am not convinced that this "dummy" replacement class
approach is the right thing; we don't do it like that elsewhere
either?
Change-Id: Ife912d9ed91bd26610ea40cf4b446beb2ed481ec
diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx
index 3cd4a9e70f4f..74ac0ecf3a1d 100644
--- a/avmedia/source/avmediadummy.cxx
+++ b/avmedia/source/avmediadummy.cxx
@@ -71,6 +71,11 @@ bool MediaItem::PutValue( const css::uno::Any&, sal_uInt8 )
return false;
}
+AVMediaSetMask MediaItem::getMaskSet() const
+{
+ return AVMediaSetMask::NONE;
+}
+
SfxPoolItem* MediaItem::CreateDefault()
{
return new MediaItem;
commit 6a37bb093a2891723d2fff720b0adaf114d7953a
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Tue Aug 28 11:07:24 2018 +0300
Commit: Tor Lillqvist <t...@iki.fi>
CommitDate: Tue Aug 28 11:18:27 2018 +0300
Bump version number in ICU data file name
Change-Id: I222792dd34cd016196dfec9870161896c7c43b0d
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 67e33800b54a..66337e63b55e 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -20,7 +20,7 @@
3941EF1D204B4C8A00082486 /* filter in Resources */ = {isa =
PBXBuildFile; fileRef = 3941EF0E204B4C8900082486 /* filter */; };
3941EF1E204B4C8A00082486 /* rc in Resources */ = {isa =
PBXBuildFile; fileRef = 3941EF0F204B4C8900082486 /* rc */; };
3941EF1F204B4C8A00082486 /* udkapi.rdb in Resources */ = {isa =
PBXBuildFile; fileRef = 3941EF10204B4C8900082486 /* udkapi.rdb */; };
- 3941EF20204B4C8A00082486 /* icudt60l.dat in Resources */ = {isa
= PBXBuildFile; fileRef = 3941EF11204B4C8900082486 /* icudt60l.dat */; };
+ 3941EF20204B4C8A00082486 /* icudt62l.dat in Resources */ = {isa
= PBXBuildFile; fileRef = 3941EF11204B4C8900082486 /* icudt62l.dat */; };
3941EF21204B4C8A00082486 /* welcome.odt in Resources */ = {isa
= PBXBuildFile; fileRef = 3941EF12204B4C8900082486 /* welcome.odt */; };
3941EF22204B4C8A00082486 /* config in Resources */ = {isa =
PBXBuildFile; fileRef = 3941EF13204B4C8900082486 /* config */; };
3941EF23204B4C8A00082486 /* share in Resources */ = {isa =
PBXBuildFile; fileRef = 3941EF14204B4C8900082486 /* share */; };
@@ -77,7 +77,7 @@
3941EF0E204B4C8900082486 /* filter */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = filter; path =
../generated/resources/filter; sourceTree = "<group>"; };
3941EF0F204B4C8900082486 /* rc */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; name = rc; path =
../generated/resources/rc; sourceTree = "<group>"; };
3941EF10204B4C8900082486 /* udkapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = udkapi.rdb; path =
../generated/resources/udkapi.rdb; sourceTree = "<group>"; };
- 3941EF11204B4C8900082486 /* icudt60l.dat */ = {isa =
PBXFileReference; lastKnownFileType = file; name = icudt60l.dat; path =
../generated/resources/icudt60l.dat; sourceTree = "<group>"; };
+ 3941EF11204B4C8900082486 /* icudt62l.dat */ = {isa =
PBXFileReference; lastKnownFileType = file; name = icudt62l.dat; path =
../generated/resources/icudt62l.dat; sourceTree = "<group>"; };
3941EF12204B4C8900082486 /* welcome.odt */ = {isa =
PBXFileReference; lastKnownFileType = file; name = welcome.odt; path =
../generated/resources/welcome.odt; sourceTree = "<group>"; };
3941EF13204B4C8900082486 /* config */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = config; path =
../generated/resources/config; sourceTree = "<group>"; };
3941EF14204B4C8900082486 /* share */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = share; path = ../generated/resources/share;
sourceTree = "<group>"; };
@@ -211,7 +211,7 @@
3941EF13204B4C8900082486 /* config */,
3941EF0E204B4C8900082486 /* filter */,
3941EF07204B4C8900082486 /* fundamentalrc */,
- 3941EF11204B4C8900082486 /* icudt60l.dat */,
+ 3941EF11204B4C8900082486 /* icudt62l.dat */,
3941EF0D204B4C8900082486 /* offapi.rdb */,
3941EF0A204B4C8900082486 /* oovbaapi.rdb */,
3941EF08204B4C8900082486 /* program */,
@@ -330,7 +330,7 @@
3941EF1B204B4C8A00082486 /* services in
Resources */,
3941EF21204B4C8A00082486 /* welcome.odt in
Resources */,
397E09031E597BD8001374E0 /* Main.storyboard in
Resources */,
- 3941EF20204B4C8A00082486 /* icudt60l.dat in
Resources */,
+ 3941EF20204B4C8A00082486 /* icudt62l.dat in
Resources */,
3941EF16204B4C8A00082486 /* fundamentalrc in
Resources */,
39514E082057E4A8005599D0 /* inc in Resources */,
3941EF1F204B4C8A00082486 /* udkapi.rdb in
Resources */,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
