[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 3 commits - sd/qa svx/inc svx/source vcl/unx

[Stephan Bergmann]

 sd/qa/unit/import-tests.cxx            |    1 
 svx/inc/getallcharpropids.hxx          |   35 +++++++++++++++++++++++++++++++++
 svx/source/svdraw/svdedtv1.cxx         |    1 
 svx/source/table/cell.cxx              |    3 --
 vcl/unx/gtk/a11y/atktextattributes.cxx |    2 -
 5 files changed, 39 insertions(+), 3 deletions(-)

New commits:
commit 7a2f811a07b99e0b7ff7e1399311da2908301a97
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 5 12:23:46 2015 +0100

    Actually execute testPDFImportSkipImages
    
    (cherry picked from commit b8ca219893a6e14bfea3cec5522532c144ad2fa6)
    Conflicts:
    	sd/qa/unit/import-tests.cxx
    
    Change-Id: Ie3dda6d7ea24031eadf86801867a94f95c11310e

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 7103e3f..024801b 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -130,6 +130,7 @@ public:
     CPPUNIT_TEST(testBnc862510_6);
     CPPUNIT_TEST(testBnc862510_7);
     CPPUNIT_TEST(testPDFImport);
+    CPPUNIT_TEST(testPDFImportSkipImages);
     CPPUNIT_TEST(testBnc910045);
 
     CPPUNIT_TEST_SUITE_END();
commit d303e0dca437b563dff026296e3e3e724a218d22
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 19 08:54:09 2015 +0100

    loplugin:externandnotdefined
    
    Change-Id: I94271681ea4ec7617eaf706fb443ebb9d1b0bc15
    (cherry picked from commit cb3518f331a99ff9a3187286e9e2b695df1c0292)

diff --git a/svx/inc/getallcharpropids.hxx b/svx/inc/getallcharpropids.hxx
new file mode 100644
index 0000000..c52d41b
--- /dev/null
+++ b/svx/inc/getallcharpropids.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SVX_INC_GETALLCHARPROPIDS_HXX
+#define INCLUDED_SVX_INC_GETALLCHARPROPIDS_HXX
+
+#include <sal/config.h>
+
+#include <vector>
+
+#include <sal/types.h>
+
+class SfxItemSet;
+
+std::vector<sal_uInt16> GetAllCharPropIds(const SfxItemSet& rSet);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 62c4cff..4a3cb0f 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -28,6 +28,7 @@
 #include <tools/bigint.hxx>
 #include <vcl/msgbox.hxx>
 
+#include "getallcharpropids.hxx"
 #include "svdglob.hxx"
 #include "svx/svditer.hxx"
 #include "svx/svdstr.hrc"
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 3468283..595f90a 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -42,6 +42,7 @@
 #include "svx/unoshtxt.hxx"
 #include "svx/svdmodel.hxx"
 
+#include "getallcharpropids.hxx"
 #include "tableundo.hxx"
 #include "cell.hxx"
 #include "svx/unoshprp.hxx"
@@ -139,8 +140,6 @@ SdrText* CellTextProvider::getText(sal_Int32 nIndex) const
 
 }
 
-extern std::vector<sal_uInt16> GetAllCharPropIds(const SfxItemSet& rSet);
-
 namespace sdr
 {
     namespace properties
commit a008ddb4f5cdbb900b43a16f9e4e7cb2bdb1e25f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 5 15:29:22 2015 +0100

    -Werror,-Wformat-security
    
    Change-Id: I62ff8a172a9c4f361ef5fcb6d60bd9fd2e959c2d
    (cherry picked from commit b8cf9b3359195f4f9f7e92f5db224a91cf994306)

diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index bc286d0..ec09a2b 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -1235,7 +1235,7 @@ attribute_set_new_from_extended_attributes(
 
         pSet = attribute_set_prepend( pSet,
                                       atk_text_attribute_register( sPropertyName.getStr() ),
-                                      g_strdup_printf( sPropertyValue.getStr() ) );
+                                      g_strdup_printf( "%s", sPropertyValue.getStr() ) );
     }
     while ( nIndex >= 0 && nIndex < sExtendedAttrs.getLength() );