[Libreoffice-commits] .: avmedia/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Fri Dec 2 19:02:24 PST 2011
avmedia/source/framework/mediaitem.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2c09f5071fe940881293615dad95b4b046a03a70
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Fri Dec 2 22:00:47 2011 -0500
Fixed build breakage, and remove warning.
OUString never understands generic int type; it thinks it's too
ambiguous, depending on 32-bit or 64-bit build environment.
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index d38548a..cb29637 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -422,7 +422,7 @@ lcl_CreateStream(uno::Reference<embed::XStorage> const& xStorage,
do
{
++count;
- filename = basename + ::rtl::OUString::valueOf(count) + suffix;
+ filename = basename + ::rtl::OUString::valueOf(static_cast<sal_Int32>(count)) + suffix;
}
while (xStorage->hasByName(filename));
}
@@ -496,7 +496,7 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
o_rEmbeddedURL = buf.makeStringAndClear();
return true;
}
- catch (uno::Exception const& e)
+ catch (uno::Exception const&)
{
SAL_WARN("avmedia",
"Exception while trying to embed media");
More information about the Libreoffice-commits
mailing list