[Libreoffice-commits] core.git: 3 commits - dbaccess/source distro-configs/LibreOfficeOssFuzz.conf fpicker/source
Caolán McNamara
caolanm at redhat.com
Mon Dec 5 21:39:26 UTC 2016
dbaccess/source/ui/inc/dbu_resource.hrc | 2 -
dbaccess/source/ui/misc/WTypeSelect.cxx | 6 -----
dbaccess/source/ui/querydesign/QTableWindow.cxx | 1
dbaccess/source/ui/querydesign/Query.hrc | 27 ------------------------
dbaccess/source/ui/querydesign/TableWindow.cxx | 6 +----
dbaccess/source/ui/querydesign/query.src | 9 +-------
distro-configs/LibreOfficeOssFuzz.conf | 2 +
fpicker/source/office/iodlg.hrc | 1
fpicker/source/office/iodlg.src | 3 --
9 files changed, 9 insertions(+), 48 deletions(-)
New commits:
commit b0e7282bdd918d35fad6e5677ebe8f01ca4a78af
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 5 21:22:18 2016 +0000
IMG_FILEDLG_BTN_STD is unused
Change-Id: Id41d43ec74575ba0edc59f87ffa8b6c9b1485010
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index d6c605d..9653e08 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -24,7 +24,6 @@
#include <vcl/fpicker.hrc>
#define IMG_FILEDLG_BTN_UP 10
-#define IMG_FILEDLG_BTN_STD 11
#define IMG_FILEDLG_CREATEFOLDER 14
#define IMG_FILEDLG_PLACE_LOCAL 15
#define IMG_FILEDLG_PLACE_REMOTE 16
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index fa1aa84..f017c4b 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -30,14 +30,13 @@ ImageList RID_FILEPICKER_IMAGES
IdList =
{
IMG_FILEDLG_BTN_UP;
- IMG_FILEDLG_BTN_STD;
IMG_FILEDLG_CREATEFOLDER;
IMG_FILEDLG_PLACE_LOCAL;
IMG_FILEDLG_PLACE_REMOTE;
};
IdCount =
{
- 5;
+ 4;
};
};
commit 9ab9a15c06cb5246471dea41d5c9f24e819bdf50
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 5 21:14:33 2016 +0000
only IMG_PRIMARY_KEY is actually used
Change-Id: Ie888ed93f0d511e0c040af32f41e8350113b586c
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 4c6cd08..386a401 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -105,6 +105,7 @@
#define QUERYFOLDER_TREE_ICON RID_IMAGE_START + 6
#define QUERY_TREE_ICON RID_IMAGE_START + 7
#define DATABASE_TREE_ICON RID_IMAGE_START + 8
+#define BMP_PRIMARY_KEY RID_IMAGE_START + 9
// free
#define IMG_PKEYICON RID_IMAGE_START + 12
// free
@@ -121,7 +122,6 @@
#define FORMFOLDER_TREE_ICON RID_IMAGE_START + 55
// image lists
-#define IMG_JOINS RID_IMAGELIST_START + 0
#define IMG_INDEX_DLG_SC RID_IMAGELIST_START + 1
#define IMG_INDEX_DLG_LC RID_IMAGELIST_START + 3
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 49ae18c..e7a6e3f 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -216,7 +216,6 @@ OUString OWizTypeSelectControl::getAutoIncrementValue() const
return static_cast<OWizTypeSelect*>(m_pParentTabPage.get())->m_sAutoIncrementValue;
}
-#define IMG_PRIMARY_KEY 1
OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream )
:OWizardPage( pParent, "TypeSelect", "dbaccess/ui/typeselectpage.ui")
,m_pTypeControl(VclPtr<OWizTypeSelectControl>::Create(get<VclVBox>("control_container"), this) )
@@ -235,10 +234,7 @@ OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream )
m_pColumnNames->SetSelectHdl(LINK(this,OWizTypeSelect,ColumnSelectHdl));
- ModuleRes aModuleRes(IMG_JOINS);
- ImageList aImageList(aModuleRes);
- m_imgPKey = aImageList.GetImage(IMG_PRIMARY_KEY);
-
+ m_imgPKey = Image(BitmapEx(ModuleRes(BMP_PRIMARY_KEY)));
m_pTypeControl->Show();
m_pTypeControl->Init();
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 6f5ae57..c56735f 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -28,7 +28,6 @@
#include <vcl/image.hxx>
#include "TableWindowListBox.hxx"
#include "dbu_qry.hrc"
-#include "Query.hrc"
#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/dbaccess/source/ui/querydesign/Query.hrc b/dbaccess/source/ui/querydesign/Query.hrc
deleted file mode 100644
index 75e2c02..0000000
--- a/dbaccess/source/ui/querydesign/Query.hrc
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- 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 DBAUI_QUERY_HRC
-#define DBAUI_QUERY_HRC
-
-#define IMG_PRIMARY_KEY 1
-#define IMG_FOREIGN_KEY 2
-
-#endif // DBAUI_QUERY_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index a03e647..66fe9de 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -37,7 +37,6 @@
#include "querycontroller.hxx"
#include "dbu_qry.hrc"
#include "dbustrings.hrc"
-#include "Query.hrc"
#include <comphelper/extract.hxx>
#include "UITools.hxx"
#include "TableWindowAccess.hxx"
@@ -193,10 +192,9 @@ bool OTableWindow::FillListBox()
if ( xContainer.is() )
m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer);
}
+
// mark all primary keys with special image
- ModuleRes TmpRes(IMG_JOINS);
- ImageList aImageList(TmpRes);
- Image aPrimKeyImage = aImageList.GetImage(IMG_PRIMARY_KEY);
+ Image aPrimKeyImage = Image(BitmapEx(ModuleRes(BMP_PRIMARY_KEY)));
if (GetData()->IsShowAll())
{
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index 14c49a2..eaaa29d 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "dbu_qry.hrc"
-#include "Query.hrc"
#include <sfx2/cntids.hrc>
#include "browserids.hxx"
#include "dbaccess_helpid.hrc"
@@ -77,13 +76,9 @@ Menu RID_QUERYCOLPOPUPMENU
};
};
-ImageList IMG_JOINS
+Bitmap BMP_PRIMARY_KEY
{
- Prefix = "jo";
- IdList = {
- IMG_PRIMARY_KEY; IMG_FOREIGN_KEY;
- };
- IdCount = { 2; };
+ File = "jo01.png";
};
String STR_QUERY_UNDO_TABWINSHOW
commit cca70d0761505822aecd8afb7cfb437ef12bcdfe
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 5 21:01:18 2016 +0000
oss-fuzz woes continue
Change-Id: I8307c09d5ba4fb24c0d2e273459b34edd06ae76a
diff --git a/distro-configs/LibreOfficeOssFuzz.conf b/distro-configs/LibreOfficeOssFuzz.conf
index df396a6..652eb83 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -13,3 +13,5 @@
--disable-cups
--disable-odk
--without-java
+--with-system-nss
+--with-system-icu
More information about the Libreoffice-commits
mailing list