diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-02-07 11:44:20 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-02-09 10:51:10 +0000 |
| commit | 3c1c50281acce8a7471ba456d514e2584e6d22d1 (patch) | |
| tree | 16405ae8d5763fe48e7063a590922c4b053b331f /svtools | |
| parent | 5236e24afddeba986802dea10f988f0559365ff8 (diff) | |
tdf#88836: UI: in-form navigation bar icons gone
Regression from:
6419c745e5e9802da264250d5e131fb9a3b6e4de
Revert it and use IsEmpty() instead of operator!().
(cherry picked from commit 905d4db48a0b98f540c8abc3e12fb80be4826029)
Conflicts:
vcl/source/gdi/impgraph.cxx
Change-Id: Icc4f5dbba848a1d4ef807e598f0aa3b940459c82
Reviewed-on: https://gerrit.libreoffice.org/14357
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/qa/unit/GraphicObjectTest.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/svtools/qa/unit/GraphicObjectTest.cxx b/svtools/qa/unit/GraphicObjectTest.cxx index 0c96f159eb28..c004604132af 100644 --- a/svtools/qa/unit/GraphicObjectTest.cxx +++ b/svtools/qa/unit/GraphicObjectTest.cxx @@ -40,6 +40,7 @@ class GraphicObjectTest: public test::BootstrapFixture, public unotest::MacrosTe public: void testSwap(); void testSizeBasedAutoSwap(); + void testTdf88836(); virtual void setUp() SAL_OVERRIDE @@ -56,6 +57,7 @@ private: CPPUNIT_TEST_SUITE(GraphicObjectTest); CPPUNIT_TEST(testSwap); CPPUNIT_TEST(testSizeBasedAutoSwap); + CPPUNIT_TEST(testTdf88836); CPPUNIT_TEST_SUITE_END(); }; @@ -227,6 +229,15 @@ void GraphicObjectTest::testSizeBasedAutoSwap() xComponent->dispose(); } +void GraphicObjectTest::testTdf88836() +{ + // Construction with empty bitmap -> type should be GRAPHIC_NONE + Graphic aGraphic = Bitmap(); + CPPUNIT_ASSERT_EQUAL(GRAPHIC_NONE, aGraphic.GetType()); + aGraphic = Graphic(BitmapEx()); + CPPUNIT_ASSERT_EQUAL(GRAPHIC_NONE, aGraphic.GetType()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(GraphicObjectTest); } |