[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/svx svx/Library_svxcore.mk svx/source
Aditya (via logerrit)
logerrit at kemper.freedesktop.org
Tue Sep 1 07:23:26 UTC 2020
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 12 ++++-----
include/svx/gallerybinaryengine.hxx | 3 +-
include/svx/galleryfilestorage.hxx | 28 +++++++++++++++++++++
svx/Library_svxcore.mk | 1
svx/source/gallery2/galleryfilestorage.cxx | 24 ++++++++++++++++++
5 files changed, 61 insertions(+), 7 deletions(-)
New commits:
commit 5694dc279e5f0f78b1bb669b22070881ab012f1a
Author: Aditya <adityasahu1511 at gmail.com>
AuthorDate: Mon Aug 3 22:50:53 2020 +0530
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Sep 1 09:22:56 2020 +0200
svx: Introduce GalleryFileStorage
Abstract class for GalleryBinaryEngine and upcoming GalleryXMLEngine. This
interface will be used by GalleryTheme.
Change-Id: I2193e3ea9860c41a1580d5ca59da68bf41b70a3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100025
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/include/svx/gallerybinaryengine.hxx b/include/svx/gallerybinaryengine.hxx
index eb9e0b291de1..e8353d11af5a 100644
--- a/include/svx/gallerybinaryengine.hxx
+++ b/include/svx/gallerybinaryengine.hxx
@@ -24,6 +24,7 @@
#include <svx/svxdllapi.h>
#include <svx/fmmodel.hxx>
#include <svx/gallerystoragelocations.hxx>
+#include <svx/galleryfilestorage.hxx>
#include <tools/urlobj.hxx>
#include <sot/storage.hxx>
@@ -40,7 +41,7 @@ class FmFormModel;
class GalleryTheme;
class GalleryThemeEntry;
-class SVXCORE_DLLPUBLIC GalleryBinaryEngine
+class SVXCORE_DLLPUBLIC GalleryBinaryEngine : public GalleryFileStorage
{
private:
tools::SvRef<SotStorage> m_aSvDrawStorageRef;
diff --git a/include/svx/galleryfilestorage.hxx b/include/svx/galleryfilestorage.hxx
new file mode 100644
index 000000000000..fee632e9b397
--- /dev/null
+++ b/include/svx/galleryfilestorage.hxx
@@ -0,0 +1,28 @@
+/* -*- 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 .
+ */
+
+#pragma once
+
+class GalleryFileStorage
+{
+public:
+ virtual ~GalleryFileStorage() = 0;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 4898c073764d..208effe3bef2 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -156,6 +156,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/gallery2/gallerybinaryengineentry \
svx/source/gallery2/gallerystoragelocations \
svx/source/gallery2/galleryobjectcollection \
+ svx/source/gallery2/galleryfilestorage \
svx/source/items/chrtitem \
svx/source/items/clipfmtitem \
svx/source/items/customshapeitem \
diff --git a/svx/source/gallery2/galleryfilestorage.cxx b/svx/source/gallery2/galleryfilestorage.cxx
new file mode 100644
index 000000000000..dd8e74cd3af4
--- /dev/null
+++ b/svx/source/gallery2/galleryfilestorage.cxx
@@ -0,0 +1,24 @@
+/* -*- 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 .
+ */
+
+#include <svx/galleryfilestorage.hxx>
+
+GalleryFileStorage::~GalleryFileStorage(){};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 13c1d05570854219bc94149bff646cba831d4cbd
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 31 14:39:43 2020 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Sep 1 09:22:45 2020 +0200
FIx typo in code
It passed "make check" on Linux
Change-Id: I055db4ca15e2e8c4c66d5970404c292255c15628
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101778
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 035e805dbfaa..f605e8fb58d4 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -708,7 +708,7 @@ namespace
const OUString aQuote = xMetaData->getIdentifierQuoteString();
const IParseContext& rContext = static_cast<OQueryController&>(_pView->getController()).getParser().getContext();
// * must not contain a filter : have I already shown the correct warning ?
- bool bCritsOnAsterikWarning = false; // ** TMFS **
+ bool bCritsOnAsteriskWarning = false; // ** TMFS **
for (sal_uInt16 i=0 ; i < nMaxCriteria ; i++)
{
@@ -728,14 +728,14 @@ namespace
if ( aFieldName.toChar() == '*' && field->isNoneFunction() )
{
// only show the messagebox the first time
- if (!bCritsOnAsterikWarning)
+ if (!bCritsOnAsteriskWarning)
{
std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(_pView->GetFrameWeld(),
VclMessageType::Warning, VclButtonsType::Ok,
DBA_RES(STR_QRY_CRITERIA_ON_ASTERISK)));
xBox->run();
}
- bCritsOnAsterikWarning = true;
+ bCritsOnAsteriskWarning = true;
continue;
}
aWork = quoteTableAlias(bMulti,field->GetAlias(),aQuote);
@@ -872,7 +872,7 @@ namespace
Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData();
OUString aQuote = xMetaData->getIdentifierQuoteString();
// * must not contain filter - have I already shown the warning?
- bool bCritsOnAsterikWarning = false; // ** TMFS **
+ bool bCritsOnAsteriskWarning = false; // ** TMFS **
for (auto const& field : _rFieldList)
{
EOrderDir eOrder = field->GetOrderDir();
@@ -884,14 +884,14 @@ namespace
if(aColumnName.toChar() == '*')
{
// only show the MessageBox the first time
- if (!bCritsOnAsterikWarning)
+ if (!bCritsOnAsteriskWarning)
{
std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(_pView->GetFrameWeld(),
VclMessageType::Warning, VclButtonsType::Ok,
DBA_RES(STR_QRY_ORDERBY_ON_ASTERISK)));
xBox->run();
}
- bCritsOnAsterikWarning = true;
+ bCritsOnAsteriskWarning = true;
continue;
}
More information about the Libreoffice-commits
mailing list