diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 09:21:53 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:11:34 +0000 |
| commit | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (patch) | |
| tree | efbfb952f3236a6f56540ddae6a896c8c73774a0 /avmedia/source/framework/modeltools.cxx | |
| parent | f12e483589888f87843026ceff5ae3c1e615ca02 (diff) | |
Formatting changes across all modules
+ Removed comment cruft
+ Tab formatting in number of files
+ Some commented out code removed
+ Tab characters replaced with spaces
+ Newline cleanup in quite a few files
+ Tweak header guard #endifs
Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc
Reviewed-on: https://gerrit.libreoffice.org/22221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'avmedia/source/framework/modeltools.cxx')
| -rw-r--r-- | avmedia/source/framework/modeltools.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 4d348c343ac0..74669af81258 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -66,6 +66,7 @@ static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFold } } + bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput) { o_rOutput.clear(); @@ -133,7 +134,8 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput) o_rOutput = sOutput + "/" + GetFilename(sOutput) + ".json"; return true; } -#endif +#endif // HAVE_FEATURE_COLLADA + static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed::XStorage> xSubStorage, ::ucbhelper::Content& rContent) { @@ -237,6 +239,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed: } } + bool Embed3DModel( const uno::Reference<frame::XModel>& xModel, const OUString& rSourceURL, OUString& o_rEmbeddedURL) { @@ -311,11 +314,12 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel, return false; } + bool IsModel(const OUString& rMimeType) { return rMimeType == AVMEDIA_MIMETYPE_JSON; } -} // namespace avemdia +} // namespace avmedia /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |