|
 |
f325b2 |
From e254c72be43380472dd662d2ec69dfb7eab231b6 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Andrzej Hunt <andrzej@ahunt.org>
|
|
|
f325b2 |
Date: Thu, 12 Nov 2015 14:30:40 +0100
|
|
|
f325b2 |
Subject: [PATCH 311/398] Use std::vector instead of an array of strings
|
|
|
f325b2 |
|
|
|
f325b2 |
This makes the code much more readable / sane.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I1d60f4102b6c619fa2fefac4a3644b7f04c0b9c0
|
|
|
f325b2 |
(cherry picked from commit d5545979fb27e317cce4d374a5a913790d8a2adf)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
desktop/source/lib/init.cxx | 8 +++++---
|
|
|
f325b2 |
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
index dbe30a640ecb..d724b81f9ac6 100644
|
|
|
f325b2 |
--- a/desktop/source/lib/init.cxx
|
|
|
f325b2 |
+++ b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
@@ -1252,7 +1252,7 @@ static char* getStyles(LibreOfficeKitDocument* pThis, const char* pCommand)
|
|
|
f325b2 |
uno::Reference<container::XNameAccess> xStyleFamilies(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
|
|
|
f325b2 |
uno::Sequence<OUString> aStyleFamilies = xStyleFamilies->getElementNames();
|
|
|
f325b2 |
|
|
|
f325b2 |
- static const sal_Char* aWriterStyles[] =
|
|
|
f325b2 |
+ static const std::vector<OUString> aWriterStyles =
|
|
|
f325b2 |
{
|
|
|
f325b2 |
"Text body",
|
|
|
f325b2 |
"Quotations",
|
|
|
f325b2 |
@@ -1263,6 +1263,8 @@ static char* getStyles(LibreOfficeKitDocument* pThis, const char* pCommand)
|
|
|
f325b2 |
"Heading 3"
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
+ // static const std::vector<OUString> aList = { "aaaa", "bbb" };
|
|
|
f325b2 |
+
|
|
|
f325b2 |
boost::property_tree::ptree aValues;
|
|
|
f325b2 |
for (sal_Int32 nStyleFam = 0; nStyleFam < aStyleFamilies.getLength(); ++nStyleFam)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
@@ -1276,10 +1278,10 @@ static char* getStyles(LibreOfficeKitDocument* pThis, const char* pCommand)
|
|
|
f325b2 |
if (sStyleFam == "ParagraphStyles"
|
|
|
f325b2 |
&& doc_getDocumentType(pThis) == LOK_DOCTYPE_TEXT)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- for( sal_uInt32 nStyle = 0; nStyle < sizeof( aWriterStyles ) / sizeof( sal_Char*); ++nStyle )
|
|
|
f325b2 |
+ for( OUString aStyle: aWriterStyles )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
uno::Reference< beans::XPropertySet > xStyle;
|
|
|
f325b2 |
- xStyleFamily->getByName( OUString::createFromAscii( aWriterStyles[nStyle] )) >>= xStyle;
|
|
|
f325b2 |
+ xStyleFamily->getByName( aStyle ) >>= xStyle;
|
|
|
f325b2 |
OUString sName;
|
|
|
f325b2 |
xStyle->getPropertyValue("DisplayName") >>= sName;
|
|
|
f325b2 |
if( !sName.isEmpty() )
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|