diff options
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/lib/init.cxx | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index f15417c92d0b..c7f3aabb58b7 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -235,7 +235,7 @@ static void doc_setGraphicSelection (LibreOfficeKitDocument* pThis, int nX, int nY); static void doc_resetSelection (LibreOfficeKitDocument* pThis); -static char* doc_getCommandValues(LibreOfficeKitDocument* pThis, const char* pCommand); +static char* doc_getStyles(LibreOfficeKitDocument* pThis); struct LibLODocument_Impl : public _LibreOfficeKitDocument { @@ -270,7 +270,7 @@ struct LibLODocument_Impl : public _LibreOfficeKitDocument m_pDocumentClass->getTextSelection = doc_getTextSelection; m_pDocumentClass->setGraphicSelection = doc_setGraphicSelection; m_pDocumentClass->resetSelection = doc_resetSelection; - m_pDocumentClass->getCommandValues = doc_getCommandValues; + m_pDocumentClass->getStyles = doc_getStyles; gDocumentClass = m_pDocumentClass; } @@ -870,17 +870,15 @@ static void doc_resetSelection(LibreOfficeKitDocument* pThis) pDoc->resetSelection(); } -static char* getStyles(LibreOfficeKitDocument* pThis, const char* pCommand) +static char* doc_getStyles(LibreOfficeKitDocument* pThis) { LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis); boost::property_tree::ptree aTree; - aTree.put("commandName", pCommand); uno::Reference<css::style::XStyleFamiliesSupplier> xStyleFamiliesSupplier(pDocument->mxComponent, uno::UNO_QUERY); uno::Reference<container::XNameAccess> xStyleFamilies(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY); uno::Sequence<OUString> aStyleFamilies = xStyleFamilies->getElementNames(); - boost::property_tree::ptree aValues; for (sal_Int32 nStyleFam = 0; nStyleFam < aStyleFamilies.getLength(); ++nStyleFam) { boost::property_tree::ptree aChildren; @@ -893,9 +891,8 @@ static char* getStyles(LibreOfficeKitDocument* pThis, const char* pCommand) aChild.put("", aStyles[nInd]); aChildren.push_back(std::make_pair("", aChild)); } - aValues.add_child(sStyleFam.toUtf8().getStr(), aChildren); + aTree.add_child(sStyleFam.toUtf8().getStr(), aChildren); } - aTree.add_child("commandValues", aValues); std::stringstream aStream; boost::property_tree::write_json(aStream, aTree); char* pJson = static_cast<char*>(malloc(aStream.str().size() + 1)); @@ -903,19 +900,6 @@ static char* getStyles(LibreOfficeKitDocument* pThis, const char* pCommand) pJson[aStream.str().size()] = '\0'; return pJson; } - -static char* doc_getCommandValues(LibreOfficeKitDocument* pThis, const char* pCommand) -{ - if (!strcmp(pCommand, ".uno:StyleApply")) - { - return getStyles(pThis, pCommand); - } - else { - gImpl->maLastExceptionMsg = "Unknown command, no values returned"; - return NULL; - } -} - static char* lo_getError (LibreOfficeKit *pThis) { LibLibreOffice_Impl* pLib = static_cast<LibLibreOffice_Impl*>(pThis); |