summaryrefslogtreecommitdiff
path: root/store
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 15:25:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:26 +0200
commitbff4c13475957863bfa7da5bc3bcf82a64a7503a (patch)
tree23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /store
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'store')
-rw-r--r--store/source/object.hxx4
-rw-r--r--store/source/storbios.hxx4
-rw-r--r--store/source/stordir.hxx4
-rw-r--r--store/source/storlckb.hxx4
-rw-r--r--store/source/storpage.hxx4
5 files changed, 10 insertions, 10 deletions
diff --git a/store/source/object.hxx b/store/source/object.hxx
index b44d83bef675..d59d9485adba 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -52,8 +52,8 @@ private:
/** The IStoreHandle TypeId.
*/
static const sal_uInt32 m_nTypeId;
- OStoreObject (const OStoreObject&) SAL_DELETED_FUNCTION;
- OStoreObject& operator= (const OStoreObject&) SAL_DELETED_FUNCTION;
+ OStoreObject (const OStoreObject&) = delete;
+ OStoreObject& operator= (const OStoreObject&) = delete;
};
/** Template helper function as dynamic_cast replacement.
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 0380b134485e..2f8a4db0b295 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -219,8 +219,8 @@ private:
storeError saveObjectAt_Impl (
OStorePageObject & rPage, sal_uInt32 nAddr);
- OStorePageBIOS (const OStorePageBIOS&) SAL_DELETED_FUNCTION;
- OStorePageBIOS& operator= (const OStorePageBIOS&) SAL_DELETED_FUNCTION;
+ OStorePageBIOS (const OStorePageBIOS&) = delete;
+ OStorePageBIOS& operator= (const OStorePageBIOS&) = delete;
};
inline OStorePageBIOS::operator osl::Mutex& (void) const
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 43ba3dc2badf..5deea4f3cb73 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -98,8 +98,8 @@ private:
sal_uInt32 m_nPath;
rtl_TextToUnicodeConverter m_hTextCvt;
- OStoreDirectory_Impl (const OStoreDirectory_Impl&) SAL_DELETED_FUNCTION;
- OStoreDirectory_Impl& operator= (const OStoreDirectory_Impl&) SAL_DELETED_FUNCTION;
+ OStoreDirectory_Impl (const OStoreDirectory_Impl&) = delete;
+ OStoreDirectory_Impl& operator= (const OStoreDirectory_Impl&) = delete;
};
template<> inline OStoreDirectory_Impl*
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index 4fffb471dd04..0ab9237c0c8b 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -134,8 +134,8 @@ private:
bool m_bWriteable;
- OStoreLockBytes (const OStoreLockBytes&) SAL_DELETED_FUNCTION;
- OStoreLockBytes& operator= (const OStoreLockBytes&) SAL_DELETED_FUNCTION;
+ OStoreLockBytes (const OStoreLockBytes&) = delete;
+ OStoreLockBytes& operator= (const OStoreLockBytes&) = delete;
};
template<> inline OStoreLockBytes*
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index f57d720076d6..687b38b943e8 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -184,8 +184,8 @@ private:
*/
storeError remove_Impl (entry & rEntry);
- OStorePageManager (const OStorePageManager&) SAL_DELETED_FUNCTION;
- OStorePageManager& operator= (const OStorePageManager&) SAL_DELETED_FUNCTION;
+ OStorePageManager (const OStorePageManager&) = delete;
+ OStorePageManager& operator= (const OStorePageManager&) = delete;
};
inline bool OStorePageManager::isValid() const
-05-31 20:48:11 +0200'>2020-05-31Resolves tdf#133268: Update Colibre color paletteRizal Muttaqin - Change color to latest MS Office monoline style - Overhaul overall appearance Change-Id: If181b58dc68310cacb926cf814c6d99d4b0b47d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95189 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> 2019-10-26Colibre: tdf#127976, Fix icons in Navigator Writer master document moderizmut - Fix for exit search icons - Update Manage Name icons in Calc Change-Id: I0302e710b65dda5ea094c7fb0899c242a34fdeb9 Reviewed-on: https://gerrit.libreoffice.org/81546 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> 2019-06-27Breeze: fix for tdf#125879rizmut - Breeze & Colibre: Rearrange Navigator's element - elementary & KJ: Add some Draw's tabbed icons - Reenable menubar icons Change-Id: Ic10c80e4674393714664568ff0914acdc54b5990 Reviewed-on: https://gerrit.libreoffice.org/74791 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> 2019-06-24Colibre: Fix for tdf#122924, tdf#126044rizmut - Clean unecessary extra outline - Update Gallery, Paste, EPUB, language - Sync extra large AutoFormat - Update table formula in Writer's Navigator - Update DB Form, Query, Report, Table - Update Draw/Impress master, Handout, Outline, Notes, Master Notes Change-Id: I1faabab504010c584f7a480ed6c521c47584df38 Writer: Re-enable some icons in menubar Reviewed-on: https://gerrit.libreoffice.org/74591 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> 2019-06-13Colibre: tdf#125879 Change Wrap Through Icon, tdf#125888, clean SVGRizal Muttaqin tdf#125742: Fix tracked change, fix blurred, missmatched icons etc Change-Id: I4d6df1ba5e2cb4b016f40e5f626e8fcabc818454 Reviewed-on: https://gerrit.libreoffice.org/73909 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> 2019-01-06tdf#120108 Wrong wrap optimal iconandreas kainz Change-Id: I7ebed364ca32c6a46387c56dfa750c8ad2c31eb1 Reviewed-on: https://gerrit.libreoffice.org/65902 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com> 2018-05-09Colibre icons: add missing galaxy sw/res/ iconsandreas kainz Change-Id: I4776c26ee099c932f75d841105c519ba0816754c Reviewed-on: https://gerrit.libreoffice.org/54011 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: andreas_kainz <kainz.a@gmail.com> 2018-05-08tdf#117474 Colibre icons: add page-shadow-mask from galaxyandreas kainz Change-Id: I0ed3fa93ecf4d0c12e8ce4072ff57232decd0cbf Reviewed-on: https://gerrit.libreoffice.org/53997 Reviewed-by: andreas_kainz <kainz.a@gmail.com> Tested-by: andreas_kainz <kainz.a@gmail.com> 2018-04-30Colibre icons: finish sw and add svx icons from galaxyandreas kainz Change-Id: I30ca92be08804bc8a1ac8d8aaeec2e4c010ea29f Reviewed-on: https://gerrit.libreoffice.org/53640 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: andreas_kainz <kainz.a@gmail.com> 2018-03-19Colibre icons: fix navigation barandreas kainz Change-Id: I145262989b7898c78d9c15ecdfd9044c5677bce4 Reviewed-on: https://gerrit.libreoffice.org/51527 Reviewed-by: andreas_kainz <kainz.a@gmail.com> Tested-by: andreas_kainz <kainz.a@gmail.com> 2018-03-14Colibre icons: add sw/res page and redline iconsandreas kainz Change-Id: Ic628811e7efd15cb85e0d0336ce9173e0fb1349a Reviewed-on: https://gerrit.libreoffice.org/51300 Reviewed-by: andreas_kainz <kainz.a@gmail.com> Tested-by: andreas_kainz <kainz.a@gmail.com> 2018-03-14Colibre icons: finish pageproppanel iconsandreas kainz Change-Id: Id52c9efdc42f2813600d2ec048687eeb9fd57c49 Reviewed-on: https://gerrit.libreoffice.org/51299 Reviewed-by: andreas_kainz <kainz.a@gmail.com> Tested-by: andreas_kainz <kainz.a@gmail.com> 2018-03-14Colibre icons: add column pageproppanel iconsandreas kainz Change-Id: I3a05c1b0172ba2c3d3becc5dbca7d7cc2d3f8567 Reviewed-on: https://gerrit.libreoffice.org/51258 Reviewed-by: andreas_kainz <kainz.a@gmail.com> Tested-by: andreas_kainz <kainz.a@gmail.com>