[Libreoffice-commits] core.git: bridges/source

2021-09-06 Thread Emircan Agac (via logerrit) 
 bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7a8ec6cddc9f37ba6ff1a98ad39702521c8fb36b
Author: Emircan Agac 
AuthorDate: Thu Aug 19 23:58:53 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Sep 6 15:37:48 2021 +0200

tdf#130924 : replace debugging printf calls with SAL_INFO/SAL_WARN

Change-Id: Ifede38f3b19d1e5226e18dba1aa21d478a430d9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120763
Tested-by: Jenkins
Reviewed-by: Hossein 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index d72295039282..6e022515b2d7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -157,9 +157,9 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription 
const & pTypeDescr)
 // symbol and rtti-name is nearly identical,
 // the symbol is prefixed with _ZTI
 char const * rttiName = symName.getStr() +4;
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr,"generated rtti for %s\n", rttiName );
-#endif
+
+SAL_INFO("bridges", "Generated rtti for" << rttiName);
+
 std::unique_ptr newRtti;
 switch (pTypeDescr.eTypeClass) {
 case typelib_TypeClass_EXCEPTION:

[Libreoffice-commits] core.git: oox/source

2021-08-16 Thread Emircan Agac (via logerrit) 
 oox/source/export/vmlexport.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 42f536df5c5b15d34c7c5663c6653d5bedbc2dc2
Author: Emircan Agac 
AuthorDate: Mon Aug 16 18:03:15 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Aug 16 22:16:59 2021 +0200

tdf#130924 : replace debugging printf calls with SAL_INFO/SAL_WARN

Change-Id: I4ca3a3a7ced1dac90ae896cc8a0abb08f830744e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120551
Tested-by: Jenkins
Reviewed-by: Hossein 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index d4243c6e07bf..f00d59f4159e 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -286,10 +286,7 @@ static void impl_AddBool( 
sax_fastparser::FastAttributeList *pAttrList, sal_Int3
 
 static void impl_AddColor( sax_fastparser::FastAttributeList *pAttrList, 
sal_Int32 nElement, sal_uInt32 nColor )
 {
-#if OSL_DEBUG_LEVEL > 0
-if ( nColor & 0xFF00 )
-fprintf( stderr, "TODO: this is not a RGB value!\n" );
-#endif
+SAL_WARN_IF( nColor & 0xFF00 , "oox.vml" , "TODO: this is not a RGB 
value!");
 
 if ( !pAttrList || ( nColor & 0xFF00 ) )
 return;

[Libreoffice-commits] core.git: sw/source

2021-08-16 Thread Emircan Agac (via logerrit) 
 sw/source/filter/ww8/docxexport.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 617fc3a0ed28b0ccc7fa658e4ba13a0fc9fb353b
Author: Emircan Agac 
AuthorDate: Sat Aug 14 12:29:36 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Aug 16 16:19:46 2021 +0200

tdf#130924 : replace debugging printf calls with SAL_INFO/SAL_WARN

Change-Id: Iafe15a9ab48f1c0e09b5e6c176ecda3d5b4ce1bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120479
Tested-by: Jenkins
Reviewed-by: Hossein 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index f13a1d2f290d..db29faff587c 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -322,9 +322,7 @@ void DocxExport::WriteFormData( const 
::sw::mark::IFieldmark& rFieldmark )
 
 void DocxExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& 
/*rFieldmark*/ )
 {
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "TODO DocxExport::WriteHyperlinkData()\n" );
-#endif
+SAL_INFO("sw.ww8", "TODO DocxExport::WriteHyperlinkData().");
 }
 
 void DocxExport::DoComboBox(const OUString& rName,

[Libreoffice-commits] core.git: 2 commits - desktop/source sw/source

2021-08-14 Thread Emircan Agac (via logerrit) 
 desktop/source/lib/init.cxx |6 +++---
 sw/source/core/undo/unattr.cxx  |2 +-
 sw/source/filter/ww8/ww8atr.cxx |   40 
 3 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit d5eceef8e02886edc142267ee8d74f7adb198a1b
Author: Emircan Agac 
AuthorDate: Fri Aug 13 16:46:29 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sat Aug 14 08:36:45 2021 +0200

tdf#140226: use StaticWhichCast

Change-Id: I5eb25fdfd629e397582cd49e3fa4acab32c05bbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120456
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 024a65c6c9b1..9ca61d6c0a4d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -823,17 +823,17 @@ void ExecuteOrientationChange()
 
 
 
SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_SIZE,
 pItem);
-pPageSizeItem.reset( static_cast(pItem->Clone()) );
+pPageSizeItem.reset(>Clone()->StaticWhichCast(SID_ATTR_PAGE_SIZE));
 
 
 
 
SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_LRSPACE,
 pItem);
-pPageLRMarginItem.reset( static_cast(pItem->Clone()) 
);
+
pPageLRMarginItem.reset(>Clone()->StaticWhichCast(SID_ATTR_PAGE_LRSPACE));
 
 
 
 
SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_ULSPACE,
 pItem);
-pPageULMarginItem.reset( static_cast(pItem->Clone()) 
);
+
pPageULMarginItem.reset(>Clone()->StaticWhichCast(SID_ATTR_PAGE_ULSPACE));
 
 
 {
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 5329f1c00c59..3c3f05ac1895 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -846,7 +846,7 @@ SwUndoDefaultAttr::SwUndoDefaultAttr( const SfxItemSet& 
rSet, const SwDoc& rDoc
 const SfxPoolItem* pItem;
 if( SfxItemState::SET == rSet.GetItemState( RES_PARATR_TABSTOP, false, 
 ) ) {
 // store separately, because it may change!
-m_pTabStop.reset( static_cast(pItem->Clone()) );
+m_pTabStop.reset(>Clone()->StaticWhichCast(RES_PARATR_TABSTOP));
 if ( 1 != rSet.Count() ) { // are there more attributes?
 m_pOldSet.reset( new SfxItemSet( rSet ) );
 }
commit 1fdb3f98590532705be9972d031eb09027795760
Author: Emircan Agac 
AuthorDate: Thu Aug 12 19:55:50 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sat Aug 14 08:36:32 2021 +0200

tdf#140226: use StaticWhichCast

Change-Id: I54f898d3341155d88b6b955b9e5001de71c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120406
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index ab73216a78aa..0783784cce46 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5361,40 +5361,40 @@ void AttributeOutputBase::OutputItem( const 
SfxPoolItem& rHt )
 CharCrossedOut(rHt.StaticWhichCast(RES_CHRATR_CROSSEDOUT));
 break;
 case RES_CHRATR_ESCAPEMENT:
-CharEscapement( static_cast< const SvxEscapementItem& >( rHt ) );
+CharEscapement(rHt.StaticWhichCast(RES_CHRATR_ESCAPEMENT));
 break;
 case RES_CHRATR_FONT:
-CharFont( static_cast< const SvxFontItem& >( rHt ) );
+CharFont(rHt.StaticWhichCast(RES_CHRATR_FONT));
 break;
 case RES_CHRATR_FONTSIZE:
-CharFontSize( static_cast< const SvxFontHeightItem& >( rHt ) );
+CharFontSize(rHt.StaticWhichCast(RES_CHRATR_FONTSIZE));
 break;
 case RES_CHRATR_KERNING:
-CharKerning( static_cast< const SvxKerningItem& >( rHt ) );
+CharKerning(rHt.StaticWhichCast(RES_CHRATR_KERNING));
 break;
 case RES_CHRATR_LANGUAGE:
-CharLanguage( static_cast< const SvxLanguageItem& >( rHt ) );
+CharLanguage(rHt.StaticWhichCast(RES_CHRATR_LANGUAGE));
 break;
 case RES_CHRATR_POSTURE:
-CharPosture( static_cast< const SvxPostureItem& >( rHt ) );
+CharPosture(rHt.StaticWhichCast(RES_CHRATR_POSTURE));
 break;
 case RES_CHRATR_SHADOWED:
-CharShadow( static_cast< const SvxShadowedItem& >( rHt ) );
+CharShadow(rHt.StaticWhichCast(RES_CHRATR_SHADOWED));
 break;
 case RES_CHRATR_UNDERLINE:
-CharUnderline( static_cast< const SvxUnderlineItem& >( rHt ) );
+CharUnderline(rHt.StaticWhichCast(RES_CHRATR_UNDERLINE));
 break;
 case RES_CHRATR_WEIGHT:
-CharWeight( static_cast< const SvxWeightItem& >( rHt ) );
+CharWeight(rHt.StaticWhichCast(RES_CHRATR_WEIGHT));
 break;
 case RES_CHRATR_AUTOKERN:
-

[Libreoffice-commits] core.git: sc/inc

2021-08-13 Thread Emircan Agac (via logerrit) 
 sc/inc/filterentries.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit ca7e81099b65a72762699791fe114df4743fca13
Author: Emircan Agac 
AuthorDate: Mon Aug 2 18:25:26 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Aug 13 17:24:45 2021 +0200

tdf#143148:Use pragma once instead of include guards

Change-Id: Ib3c0d6c158e5efbbca55e03f189dccaf67832a96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119888
Reviewed-by: Hossein 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/sc/inc/filterentries.hxx b/sc/inc/filterentries.hxx
index 6cbe4c43a929..02110c879b03 100644
--- a/sc/inc/filterentries.hxx
+++ b/sc/inc/filterentries.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SC_INC_FILTERENTRIES_HXX
-#define SC_INC_FILTERENTRIES_HXX
+#pragma once
 
 #include 
 #include "typedstrdata.hxx"
@@ -44,6 +43,4 @@ struct ScFilterEntries
 }
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */

[Libreoffice-commits] core.git: chart2/qa

2021-08-13 Thread Emircan Agac (via logerrit) 
 chart2/qa/extras/chart2import.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5d99a63fec50acca62fc9365708fc18bdcfedd68
Author: Emircan Agac 
AuthorDate: Sun Aug 8 23:51:58 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Fri Aug 13 16:22:38 2021 +0200

tdf#141908: CppUnittests: replace usage of sal_Int32 with colors

Change-Id: I7df5ec2eac7339e27f03ce8756522756b2fc80da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120184
Tested-by: Jenkins
Reviewed-by: Hossein 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 383e4524468a..388e0e5f1900 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -1141,9 +1141,9 @@ void Chart2ImportTest::testChartHatchFillXLSX()
 xPropSet->getPropertyValue("FillBackground") >>= bBackgroundFill;
 CPPUNIT_ASSERT(bBackgroundFill);
 
-sal_Int32 nBackgroundColor;
+Color nBackgroundColor;
 xPropSet->getPropertyValue("FillColor") >>= nBackgroundColor;
-CPPUNIT_ASSERT_EQUAL(static_cast(0xFF), nBackgroundColor);
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, nBackgroundColor);
 
 // Check the datapoint has HatchName value
 uno::Reference 
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));

[Libreoffice-commits] core.git: idl/source

2021-08-13 Thread Emircan Agac (via logerrit) 
 idl/source/objects/basobj.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c7685f030fe39ff25c4ad30bc94e28ead7476934
Author: Emircan Agac 
AuthorDate: Wed Aug 11 19:40:22 2021 +0300
Commit: Michael Stahl 
CommitDate: Fri Aug 13 10:43:58 2021 +0200

tdf#114441:Convert use of sal_uLong to better integer types

Change-Id: I14cfc4113e9aff0fcff3b2d3c2b0444aad8934ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120332
Tested-by: Jenkins
Reviewed-by: Hossein 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 6ec830a6f739..551e002d046a 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -43,7 +43,7 @@ void SvMetaObject::WriteStars( SvStream & rOutStm )
 void SvMetaObject::Back2Delimiter( SvStream & rOutStm )
 {
 // write no empty brackets
-sal_uLong nPos = rOutStm.Tell();
+sal_uInt64 nPos = rOutStm.Tell();
 rOutStm.SeekRel( -1 );
 char c = 0;
 rOutStm.ReadChar( c );

[Libreoffice-commits] core.git: vcl/source

2021-08-12 Thread Emircan Agac (via logerrit) 
 vcl/source/graphic/UnoGraphicObject.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 56ace1c8728ffc9f34901497fa907818412046ea
Author: Emircan Agac 
AuthorDate: Mon Aug 9 11:59:07 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Aug 12 12:54:11 2021 +0200

tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: Ifce4c42df52ce03ed1c509d9fc28de79f5b3426c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120199
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/vcl/source/graphic/UnoGraphicObject.cxx 
b/vcl/source/graphic/UnoGraphicObject.cxx
index 978983715a1c..73bbcef3ec8e 100644
--- a/vcl/source/graphic/UnoGraphicObject.cxx
+++ b/vcl/source/graphic/UnoGraphicObject.cxx
@@ -60,7 +60,7 @@ public:
 
 virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() 
override
 {
-return uno::Sequence { "com.sun.star.graphic.GraphicObject" 
};
+return { "com.sun.star.graphic.GraphicObject" };
 }
 };

[Libreoffice-commits] core.git: sw/source

2021-08-12 Thread Emircan Agac (via logerrit) 
 sw/source/filter/ww8/ww8par6.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ee0cf03dc4a551b1cd03ee438b83fd7eea628fc5
Author: Emircan Agac 
AuthorDate: Wed Aug 11 00:38:51 2021 +0300
Commit: Michael Stahl 
CommitDate: Thu Aug 12 11:39:25 2021 +0200

tdf#114441:Convert use of sal_uLong to better integer types

Change-Id: I0642261314f9b04fb38b68afd44d879c1e83c830
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120300
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 572a33823713..1bbeb17334a3 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1759,7 +1759,7 @@ void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29, 
SwWW8ImplReader* pIo)
 break;  // (*pPap)++ does not work for FastSave
 // -> for FastSave, no test for 
graphics APO
 SvStream* pIoStrm = pIo->m_pStrm;
-sal_uLong nPos = pIoStrm->Tell();
+sal_uInt64 nPos = pIoStrm->Tell();
 WW8PLCFxSave1 aSave;
 xPlcxMan->GetPap()->Save( aSave );
 bGrafApo = false;

[Libreoffice-commits] core.git: store/source

2021-08-10 Thread Emircan Agac (via logerrit) 
 store/source/storbios.hxx |5 +
 store/source/storcach.hxx |5 +
 store/source/stordata.hxx |5 +
 store/source/stordir.hxx  |5 +
 store/source/storlckb.hxx |5 +
 store/source/storpage.hxx |5 +
 6 files changed, 6 insertions(+), 24 deletions(-)

New commits:
commit 1788dbb32fd212a716ffca4facfc421c59f9ef5a
Author: Emircan Agac 
AuthorDate: Thu Aug 5 17:25:03 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Aug 10 20:59:22 2021 +0200

tdf#143148:Use pragma once in store

Change-Id: Ia12dd3d7b69a8fdfbdfa6503e1ce2ee46c9446d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120075
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 6ba09a876e50..3cea84bb2494 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORBIOS_HXX
-#define INCLUDED_STORE_SOURCE_STORBIOS_HXX
+#pragma once
 
 #include 
 #include 
@@ -186,6 +185,4 @@ inline bool OStorePageBIOS::isValid() const
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORBIOS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index 7032ade7b2dd..cd4672e1980b 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORCACH_HXX
-#define INCLUDED_STORE_SOURCE_STORCACH_HXX
+#pragma once
 
 #include 
 
@@ -106,6 +105,4 @@ storeError PageCache_createInstance (
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORCACH_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index 7662bbe3bdbe..7b5b8a0b8467 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORDATA_HXX
-#define INCLUDED_STORE_SOURCE_STORDATA_HXX
+#pragma once
 
 #include 
 
@@ -746,6 +745,4 @@ private:
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORDATA_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index f9845bc295eb..6d0011124378 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORDIR_HXX
-#define INCLUDED_STORE_SOURCE_STORDIR_HXX
+#pragma once
 
 #include 
 
@@ -110,6 +109,4 @@ SAL_CALL query (OStoreObject *pHandle, SAL_UNUSED_PARAMETER 
OStoreDirectory_Impl
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORDIR_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index b31bcd28de6e..7d4231dc08f3 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORLCKB_HXX
-#define INCLUDED_STORE_SOURCE_STORLCKB_HXX
+#pragma once
 
 #include 
 
@@ -135,6 +134,4 @@ SAL_CALL query (OStoreObject *pHandle, SAL_UNUSED_PARAMETER 
OStoreLockBytes*)
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORLCKB_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index 4a03c736c495..46c61763964b 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORPAGE_HXX
-#define INCLUDED_STORE_SOURCE_STORPAGE_HXX
+#pragma once
 
 #include 
 #include 
@@ -153,6 +152,4 @@ SAL_CALL query (OStoreObject *pHandle, SAL_UNUSED_PARAMETER 
OStorePageManager*)
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORPAGE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */