diff options
| author | Baole Fang <baole.fang@gmail.com> | 2023-03-16 20:47:03 -0400 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-03-17 19:52:06 +0000 |
| commit | 70b8adb100499178ad52f23f7c0a1b7a31129921 (patch) | |
| tree | 35fc0887bb31b27a145eee07a93aaeffa45da128 /desktop | |
| parent | 9a9ee21ec237eda5df6ea70bfa3bec07b44b4d21 (diff) | |
tdf#153683: Refactor fix
Change-Id: I3358c99425edae92bde120eda4fd905552444eba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149034
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index f314fcd0ff4b..b00cff042b7e 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -285,41 +285,38 @@ void batchPrint( std::u16string_view rPrinterName, const Reference< XPrintable > } // Get xDoc module name -OUString getName(const Reference< XPrintable > & xDoc) +OUString getName(const Reference< XInterface > & xDoc) { - OUString aDocService; Reference< XModel > xModel( xDoc, UNO_QUERY ); - const Reference<XServiceInfo> xServiceInfo(xModel, UNO_QUERY_THROW); - if ( xModel.is() ) - { - utl::MediaDescriptor aMediaDesc( xModel->getArgs() ); - aDocService = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTSERVICE, OUString() ); - } - OString aModuleId = OUStringToOString(aDocService, osl_getThreadTextEncoding()); - if (aModuleId == "com.sun.star.text.TextDocument" - || aModuleId == "com.sun.star.text.GlobalDocument") + if (!xModel) + return OUString(); + utl::MediaDescriptor aMediaDesc( xModel->getArgs() ); + OUString aDocService = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTSERVICE, OUString() ); + if (aDocService == "com.sun.star.text.TextDocument") return "Writer"; - else if (aModuleId == "com.sun.star.text.WebDocument") + else if (aDocService == "com.sun.star.text.GlobalDocument") + return "Writer master"; + else if (aDocService == "com.sun.star.text.WebDocument") return "Writer/Web"; - else if (aModuleId == "com.sun.star.drawing.DrawingDocument") + else if (aDocService == "com.sun.star.drawing.DrawingDocument") return "Draw"; - else if (aModuleId == "com.sun.star.presentation.PresentationDocument") + else if (aDocService == "com.sun.star.presentation.PresentationDocument") return "Impress"; - else if (aModuleId == "com.sun.star.sheet.SpreadsheetDocument") + else if (aDocService == "com.sun.star.sheet.SpreadsheetDocument") return "Calc"; - else if (aModuleId == "com.sun.star.script.BasicIDE") + else if (aDocService == "com.sun.star.script.BasicIDE") return "Basic"; - else if (aModuleId == "com.sun.star.formula.FormulaProperties") + else if (aDocService == "com.sun.star.formula.FormulaProperties") return "Math"; - else if (aModuleId == "com.sun.star.sdb.RelationDesign") + else if (aDocService == "com.sun.star.sdb.RelationDesign") return "Relation Design"; - else if (aModuleId == "com.sun.star.sdb.QueryDesign") + else if (aDocService == "com.sun.star.sdb.QueryDesign") return "Query Design"; - else if (aModuleId == "com.sun.star.sdb.TableDesign") + else if (aDocService == "com.sun.star.sdb.TableDesign") return "Table Design"; - else if (aModuleId == "com.sun.star.sdb.DataSourceBrowser") + else if (aDocService == "com.sun.star.sdb.DataSourceBrowser") return "Data Source Browser"; - else if (aModuleId == "com.sun.star.sdb.DatabaseDocument") + else if (aDocService == "com.sun.star.sdb.DatabaseDocument") return "Database"; return OUString(); @@ -704,8 +701,10 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest { OUString name=getName(xDoc); std::cout << "convert " << aSource8; + if (!name.isEmpty()) + std::cout << " as a " << name <<" document"; if (!bMultiFileTarget) - std::cout << " -> " << aTargetURL8 << " as a " << name <<" document"; + std::cout << " -> " << aTargetURL8; std::cout << " using filter : " << OUStringToOString(aFilter, osl_getThreadTextEncoding()) << std::endl; if (!bMultiFileTarget && FStatHelper::IsDocument(aOutFile)) std::cout << "Overwriting: " << OUStringToOString(aTempName, osl_getThreadTextEncoding()) << std::endl ; |