From 95aad95fbec35c3aab777b176218a29821f79574 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 22 Jul 2015 13:31:57 +0200 Subject: inline a handful of use-once #defines Change-Id: Id2654555c4042f8c0bdbd6bab6507e705f08326b --- .../source/extended/accessibletabbarpagelist.cxx | 20 -------------- .../source/standard/vclxaccessiblestatusbar.cxx | 1 - bin/find-unused-defines.awk | 2 +- desktop/win32/source/applauncher/launcher.cxx | 2 +- desktop/win32/source/applauncher/launcher.hxx | 2 -- i18npool/inc/servicename.hxx | 3 +- include/vcl/vclevent.hxx | 6 ++-- registry/source/keyimpl.cxx | 32 +++++++++++----------- registry/source/regimpl.cxx | 28 +++++++++---------- registry/source/regimpl.hxx | 13 --------- sc/inc/global.hxx | 15 +--------- sc/source/filter/excel/xichart.cxx | 6 ---- sc/source/filter/excel/xlescher.cxx | 4 +-- sc/source/filter/inc/xlchart.hxx | 5 ---- sc/source/filter/starcalc/scflt.cxx | 16 +++++------ sc/source/ui/inc/acredlin.hxx | 7 ----- sc/source/ui/inc/highred.hxx | 8 ------ shell/inc/internal/config.hxx | 2 -- ucb/source/ucp/file/shell.cxx | 31 ++++++++++----------- ucb/source/ucp/file/shell.hxx | 12 ++------ ucb/source/ucp/webdav-neon/webdavprovider.hxx | 22 ++++----------- ucb/source/ucp/webdav/webdavprovider.hxx | 22 ++++----------- vcl/unx/generic/gdi/openglx11cairotextrender.hxx | 2 +- vcl/unx/generic/gdi/x11cairotextrender.hxx | 2 +- vcl/unx/gtk/a11y/atkbridge.cxx | 6 ++-- vcl/unx/gtk/a11y/atkfactory.hxx | 2 -- vcl/unx/gtk/a11y/atkutil.hxx | 2 -- vcl/unx/gtk/a11y/atkwindow.hxx | 2 -- 28 files changed, 80 insertions(+), 195 deletions(-) diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 33b5dd518f97..f8cf1fd3082c 100755 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -239,26 +239,6 @@ namespace accessibility UpdateShowing( false ); } break; - case VCLEVENT_TABBAR_PAGEENABLED: - { - if ( m_pTabBar ) - { - sal_uInt16 nPageId = (sal_uInt16)reinterpret_cast(rVclWindowEvent.GetData()); - sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId ); - UpdateEnabled( nPagePos, true ); - } - } - break; - case VCLEVENT_TABBAR_PAGEDISABLED: - { - if ( m_pTabBar ) - { - sal_uInt16 nPageId = (sal_uInt16)reinterpret_cast(rVclWindowEvent.GetData()); - sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId ); - UpdateEnabled( nPagePos, false ); - } - } - break; case VCLEVENT_TABBAR_PAGESELECTED: { // do nothing diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index d450f84e8c82..e3bbff890d6a 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -205,7 +205,6 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind } break; case VCLEVENT_STATUSBAR_SHOWALLITEMS: - case VCLEVENT_STATUSBAR_HIDEALLITEMS: { for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i ) UpdateShowing( i, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWALLITEMS ); diff --git a/bin/find-unused-defines.awk b/bin/find-unused-defines.awk index 2649e41d0534..c5c52963975b 100644 --- a/bin/find-unused-defines.awk +++ b/bin/find-unused-defines.awk @@ -4,7 +4,7 @@ } END { - tmp = substr(y, 0, index(y, ":")) + tmp = substr(y, 0, index(y, ":")-1) if (x==1) print "sed -i '/[[:space:]]" p1 "[[:space:]]/d' " tmp } diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx index 8c61a3ccfcee..69f7472a1129 100644 --- a/desktop/win32/source/applauncher/launcher.cxx +++ b/desktop/win32/source/applauncher/launcher.cxx @@ -71,7 +71,7 @@ extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) GetModuleFileName( NULL, szApplicationName, MAX_PATH ); _tsplitpath( szApplicationName, szDrive, szDir, szFileName, szExt ); - _tmakepath( szApplicationName, szDrive, szDir, OFFICE_IMAGE_NAME, _T(".exe") ); + _tmakepath( szApplicationName, szDrive, szDir, _T("soffice"), _T(".exe") ); PROCESS_INFORMATION aProcessInfo; diff --git a/desktop/win32/source/applauncher/launcher.hxx b/desktop/win32/source/applauncher/launcher.hxx index 1ea51cf2b757..7bf05ad15f9d 100644 --- a/desktop/win32/source/applauncher/launcher.hxx +++ b/desktop/win32/source/applauncher/launcher.hxx @@ -40,8 +40,6 @@ # define GetArgv( pArgc ) (*pArgc = __argc, __argv) #endif -#define OFFICE_IMAGE_NAME _T("soffice") - extern _TCHAR APPLICATION_SWITCH[]; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/inc/servicename.hxx b/i18npool/inc/servicename.hxx index 99f31d75c5e8..4a293bcdb78d 100644 --- a/i18npool/inc/servicename.hxx +++ b/i18npool/inc/servicename.hxx @@ -58,8 +58,7 @@ Implementation Name #define INCLUDED_I18NPOOL_INC_SERVICENAME_HXX #define TRLT_SERVICELNAME "com.sun.star.i18n.Transliteration" -#define TRLT_SERVICELNAME_PREFIX TRLT_SERVICELNAME "." -#define TRLT_SERVICELNAME_L10N TRLT_SERVICELNAME_PREFIX "l10n" +#define TRLT_SERVICELNAME_L10N TRLT_SERVICELNAME ".l10n" #define TRLT_IMPLNAME_PREFIX "com.sun.star.i18n.Transliteration." // 1...5...901...5...901...5...901..4 --> 34 diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 5729e1d4fcd5..ae904a8c0573 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -113,8 +113,8 @@ namespace com { namespace sun { namespace star { #define VCLEVENT_WINDOW_MENUBARADDED 1136 // pData = pMenuBar #define VCLEVENT_TABPAGE_ACTIVATE 1137 // pData = pageid #define VCLEVENT_TABPAGE_DEACTIVATE 1138 // pData = pageid -#define VCLEVENT_TABBAR_PAGEENABLED 1139 // pData = pageid -#define VCLEVENT_TABBAR_PAGEDISABLED 1140 // pData = pageid +// free +// free #define VCLEVENT_TABBAR_PAGESELECTED 1141 // pData = pageid #define VCLEVENT_TABBAR_PAGEACTIVATED 1142 // pData = pageid #define VCLEVENT_TABBAR_PAGEDEACTIVATED 1143 // pData = pageid @@ -139,7 +139,7 @@ namespace com { namespace sun { namespace star { #define VCLEVENT_STATUSBAR_SHOWITEM 1162 // pData = itemid #define VCLEVENT_STATUSBAR_HIDEITEM 1163 // pData = itemid #define VCLEVENT_STATUSBAR_SHOWALLITEMS 1164 -#define VCLEVENT_STATUSBAR_HIDEALLITEMS 1165 +// free #define VCLEVENT_STATUSBAR_DRAWITEM 1166 // pData = itemid #define VCLEVENT_STATUSBAR_NAMECHANGED 1167 // pData = itemid #define VCLEVENT_TOOLBOX_ITEMENABLED 1168 // pData = itempos diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index 8336ff90b6b4..75256d4b54af 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -225,11 +225,11 @@ RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* pValueTy { OStoreStream rValue; sal_uInt8* pBuffer; - storeAccessMode accessMode = VALUE_MODE_OPEN; + storeAccessMode accessMode = store_AccessReadWrite; if (m_pRegistry->isReadOnly()) { - accessMode = VALUE_MODE_OPENREAD; + accessMode = store_AccessReadOnly; } OUString sImplValueName( VALUE_PREFIX ); @@ -308,7 +308,7 @@ RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegVal REG_GUARD(m_pRegistry->m_mutex); - if ( rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT , sImplValueName, VALUE_MODE_CREATE) ) + if ( rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT , sImplValueName, store_AccessCreate) ) { return RegError::SET_VALUE_FAILED; } @@ -378,7 +378,7 @@ RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32* pValueL REG_GUARD(m_pRegistry->m_mutex); - if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, VALUE_MODE_CREATE) ) + if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, store_AccessCreate) ) { return RegError::SET_VALUE_FAILED; } @@ -437,7 +437,7 @@ RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValu REG_GUARD(m_pRegistry->m_mutex); - if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, VALUE_MODE_CREATE) ) + if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, store_AccessCreate) ) { return RegError::SET_VALUE_FAILED; } @@ -505,7 +505,7 @@ RegError ORegKey::setUnicodeListValue(const OUString& valueName, sal_Unicode** p REG_GUARD(m_pRegistry->m_mutex); - if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, VALUE_MODE_CREATE) ) + if (rValue.create(getStoreFile(), m_name + m_pRegistry->ROOT, sImplValueName, store_AccessCreate) ) { return RegError::SET_VALUE_FAILED; } @@ -564,11 +564,11 @@ RegError ORegKey::getValue(const OUString& valueName, RegValue value) const sal_uInt8* pBuffer; RegValueType valueType; sal_uInt32 valueSize; - storeAccessMode accessMode = VALUE_MODE_OPEN; + storeAccessMode accessMode = store_AccessReadWrite; if (m_pRegistry->isReadOnly()) { - accessMode = VALUE_MODE_OPENREAD; + accessMode = store_AccessReadOnly; } OUString sImplValueName( VALUE_PREFIX ); @@ -658,11 +658,11 @@ RegError ORegKey::getLongListValue(const OUString& valueName, sal_Int32** pValue sal_uInt8* pBuffer; RegValueType valueType; sal_uInt32 valueSize; - storeAccessMode accessMode = VALUE_MODE_OPEN; + storeAccessMode accessMode = store_AccessReadWrite; if (m_pRegistry->isReadOnly()) { - accessMode = VALUE_MODE_OPENREAD; + accessMode = store_AccessReadOnly; } OUString sImplValueName( VALUE_PREFIX ); @@ -772,11 +772,11 @@ RegError ORegKey::getStringListValue(const OUString& valueName, sal_Char*** pVal sal_uInt8* pBuffer; RegValueType valueType; sal_uInt32 valueSize; - storeAccessMode accessMode = VALUE_MODE_OPEN; + storeAccessMode accessMode = store_AccessReadWrite; if (m_pRegistry->isReadOnly()) { - accessMode = VALUE_MODE_OPENREAD; + accessMode = store_AccessReadOnly; } OUString sImplValueName( VALUE_PREFIX ); @@ -878,11 +878,11 @@ RegError ORegKey::getUnicodeListValue(const OUString& valueName, sal_Unicode*** sal_uInt8* pBuffer; RegValueType valueType; sal_uInt32 valueSize; - storeAccessMode accessMode = VALUE_MODE_OPEN; + storeAccessMode accessMode = store_AccessReadWrite; if (m_pRegistry->isReadOnly()) { - accessMode = VALUE_MODE_OPENREAD; + accessMode = store_AccessReadOnly; } OUString sImplValueName( VALUE_PREFIX ); @@ -1016,7 +1016,7 @@ OStoreDirectory ORegKey::getStoreDir() OStoreDirectory rStoreDir; OUString fullPath; OUString relativName; - storeAccessMode accessMode = KEY_MODE_OPEN; + storeAccessMode accessMode = store_AccessReadWrite; if ( m_name.equals(m_pRegistry->ROOT) ) { @@ -1030,7 +1030,7 @@ OStoreDirectory ORegKey::getStoreDir() if (m_pRegistry->isReadOnly()) { - accessMode = KEY_MODE_OPENREAD; + accessMode = store_AccessReadOnly; } rStoreDir.create(getStoreFile(), fullPath, relativName, accessMode); diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index d31458af72bb..3499a5a83167 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -456,16 +456,16 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo { RegError eRet = RegError::INVALID_REGISTRY; OStoreFile rRegFile; - storeAccessMode sAccessMode = REG_MODE_OPEN; + storeAccessMode sAccessMode = store_AccessReadWrite; storeError errCode; if (bCreate) { - sAccessMode = REG_MODE_CREATE; + sAccessMode = store_AccessCreate; } else if (accessMode & RegAccessMode::READONLY) { - sAccessMode = REG_MODE_OPENREAD; + sAccessMode = store_AccessReadOnly; m_readOnly = true; } @@ -673,7 +673,7 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName, token = sFullKeyName.getToken( 0, '/', nIndex ); if (!token.isEmpty()) { - if (rStoreDir.create(pKey->getStoreFile(), sFullPath.getStr(), token, KEY_MODE_CREATE)) + if (rStoreDir.create(pKey->getStoreFile(), sFullPath.getStr(), token, store_AccessCreate)) { return RegError::CREATE_KEY_FAILED; } @@ -720,7 +720,7 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName, sal_Int32 n = path.lastIndexOf('/') + 1; switch (OStoreDirectory().create( pKey->getStoreFile(), path.copy(0, n), path.copy(n), - isReadOnly() ? KEY_MODE_OPENREAD : KEY_MODE_OPEN)) + isReadOnly() ? store_AccessReadOnly : store_AccessReadWrite)) { case store_E_NotExists: return RegError::KEY_NOT_EXISTS; @@ -1010,13 +1010,13 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, RegValueType valueType; sal_uInt32 valueSize; sal_uInt32 nSize; - storeAccessMode sourceAccess = VALUE_MODE_OPEN; + storeAccessMode sourceAccess = store_AccessReadWrite; OUString sTargetPath(pTargetKey->getName()); OUString sSourcePath(pSourceKey->getName()); if (pSourceKey->isReadOnly()) { - sourceAccess = VALUE_MODE_OPENREAD; + sourceAccess = store_AccessReadOnly; } if (nCut) @@ -1076,7 +1076,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, OStoreFile rTargetFile(pTargetKey->getStoreFile()); - if (!rValue.create(rTargetFile, sTargetPath, valueName, VALUE_MODE_OPEN)) + if (!rValue.create(rTargetFile, sTargetPath, valueName, store_AccessReadWrite)) { if (valueType == RegValueType::BINARY) { @@ -1100,7 +1100,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, } // write - if (rValue.create(rTargetFile, sTargetPath, valueName, VALUE_MODE_CREATE)) + if (rValue.create(rTargetFile, sTargetPath, valueName, store_AccessCreate)) { rtl_freeMemory(pBuffer); return RegError::INVALID_VALUE; @@ -1352,7 +1352,7 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey, sFullKeyName += keyName; OStoreDirectory rStoreDir; - if (rStoreDir.create(pTargetKey->getStoreFile(), sFullPath, keyName, KEY_MODE_CREATE)) + if (rStoreDir.create(pTargetKey->getStoreFile(), sFullPath, keyName, store_AccessCreate)) { return RegError::CREATE_KEY_FAILED; } @@ -1458,11 +1458,11 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_ RegValueType valueType; OUString sFullPath(sPath); OString sIndent; - storeAccessMode accessMode = VALUE_MODE_OPEN; + storeAccessMode accessMode = store_AccessReadWrite; if (isReadOnly()) { - accessMode = VALUE_MODE_OPENREAD; + accessMode = store_AccessReadOnly; } for (int i= 0; i < nSpc; i++) sIndent += " "; @@ -1694,12 +1694,12 @@ RegError ORegistry::dumpKey(const OUString& sPath, const OUString& sName, sal_In OStoreDirectory rStoreDir; OUString sFullPath(sPath); OString sIndent; - storeAccessMode accessMode = KEY_MODE_OPEN; + storeAccessMode accessMode = store_AccessReadWrite; RegError _ret = RegError::NO_ERROR; if (isReadOnly()) { - accessMode = KEY_MODE_OPENREAD; + accessMode = store_AccessReadOnly; } for (int i= 0; i < nSpace; i++) sIndent += " "; diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index 70d4a78cad74..eb1d8e099aff 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -30,19 +30,6 @@ #define REG_PAGESIZE 512 -#define REG_MODE_CREATE store_AccessCreate -#define REG_MODE_OPEN store_AccessReadWrite -#define REG_MODE_OPENREAD store_AccessReadOnly - -#define KEY_MODE_CREATE store_AccessCreate -#define KEY_MODE_OPEN store_AccessReadWrite -#define KEY_MODE_OPENREAD store_AccessReadOnly - - -#define VALUE_MODE_CREATE store_AccessCreate -#define VALUE_MODE_OPEN store_AccessReadWrite -#define VALUE_MODE_OPENREAD store_AccessReadOnly - // 5 bytes = 1 (byte for the type) + 4 (bytes for the size of the data) #define VALUE_HEADERSIZE 5 #define VALUE_TYPEOFFSET 1 diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 7744d7b4fc5a..c3b672c8353f 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -72,18 +72,9 @@ const sal_Unicode CHAR_ZWNBSP = 0x2060; const SCSIZE MAXSUBTOTAL = 3; -#define SC_USE_PS_POINTS 1 /**< use PostScript points (72ppi) instead of old TeX points (72.27ppi) */ - #define PIXEL_PER_INCH 96.0 - #define CM_PER_INCH 2.54 -#define PS_POINTS_PER_INCH 72.0 /**< PostScript points per inch */ -#define TEX_POINTS_PER_INCH 72.27 /**< old printer points, or TeX points per inch */ -#if SC_USE_PS_POINTS -#define POINTS_PER_INCH PS_POINTS_PER_INCH /**< the actual definition of points used */ -#else -#define POINTS_PER_INCH TEX_POINTS_PER_INCH -#endif +#define POINTS_PER_INCH 72.0 /**< PostScript points per inch */ #define PIXEL_PER_POINT (PIXEL_PER_INCH / POINTS_PER_INCH) #define TWIPS_PER_POINT 20.0 #define TWIPS_PER_INCH (TWIPS_PER_POINT * POINTS_PER_INCH) @@ -94,11 +85,7 @@ const SCSIZE MAXSUBTOTAL = 3; #define PIXEL_PER_TWIPS (PIXEL_PER_INCH / TWIPS_PER_INCH) #define HMM_PER_TWIPS (CM_PER_TWIPS * 1000.0) -#if SC_USE_PS_POINTS #define STD_COL_WIDTH 1280 /* 2.2577cm, 64.00pt PS */ -#else -#define STD_COL_WIDTH 1285 /* 2.2581cm, 64.25pt TeX */ -#endif #define STD_EXTRA_WIDTH 113 /* 2mm extra for optimal width, * 0.1986cm with TeX points, * 0.1993cm with PS points. */ diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 1908a0ea0d00..270f33ae14a4 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -1526,11 +1526,9 @@ void XclImpChDataFormat::Convert( ScfPropertySet& rPropSet, const XclChExtTypeIn bool bUsePicFmt = rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_BAR; ConvertFrameBase( GetChRoot(), rPropSet, rTypeInfo.GetSeriesObjectType(), maData.mnFormatIdx, bUsePicFmt ); -#if EXC_CHART2_3DBAR_HAIRLINES_ONLY // #i83151# only hair lines in 3D charts with filled data points if( rTypeInfo.mb3dChart && rTypeInfo.IsSeriesFrameFormat() && mxLineFmt && mxLineFmt->HasLine() ) rPropSet.SetProperty< sal_Int32 >( "BorderWidth", 0 ); -#endif // other formatting if( mxMarkerFmt ) @@ -2066,11 +2064,7 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const // own area formatting for every data point (TODO: varying line color not supported) bool bVarPointFmt = pTypeGroup->HasVarPointFormat() && rTypeInfo.IsSeriesFrameFormat(); -#if EXC_CHART2_VARYCOLORSBY_PROP - aSeriesProp.SetBoolProperty( EXC_CHPROP_VARYCOLORSBY, bVarPointFmt ); -#else aSeriesProp.SetBoolProperty( EXC_CHPROP_VARYCOLORSBY, rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE ); -#endif // #i91271# always set area formatting for every point in pie/doughnut charts if (mxSeriesFmt && mxValueLink && ((bVarPointFmt && mxSeriesFmt->IsAutoArea()) || (rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE))) { diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 5134f23a2dbd..1f2227176e22 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -50,8 +50,8 @@ double lclGetTwipsScale( MapUnit eMapUnit ) double fScale = 1.0; switch( eMapUnit ) { - case MAP_TWIP: fScale = PS_POINTS_PER_INCH / POINTS_PER_INCH; break; // Calc twips <-> real twips - case MAP_100TH_MM: fScale = HMM_PER_TWIPS; break; // Calc twips <-> 1/100mm + case MAP_TWIP: fScale = 1; break; // Calc twips <-> real twips + case MAP_100TH_MM: fScale = HMM_PER_TWIPS; break; // Calc twips <-> 1/100mm default: OSL_FAIL( "lclGetTwipsScale - map unit not implemented" ); } return fScale; diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 3156d98157d9..3c3234737455 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -20,11 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_FILTER_INC_XLCHART_HXX #define INCLUDED_SC_SOURCE_FILTER_INC_XLCHART_HXX -// disable/enable support for varied point colors property -#define EXC_CHART2_VARYCOLORSBY_PROP 0 -// disable/enable restriction to hair lines in 3D bar charts (#i83151#) -#define EXC_CHART2_3DBAR_HAIRLINES_ONLY 1 - #include #include "fapihelper.hxx" #include diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index db6680129eca..9dc3b4376a90 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -679,14 +679,14 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) { Sc10PageFormat* pPage = &At(i)->aPageFormat; - pPage->Width = (short) ( pPage->Width * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 ); - pPage->Height = (short) ( pPage->Height * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 ); - pPage->Top = (short) ( pPage->Top * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 ); - pPage->Bottom = (short) ( pPage->Bottom * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 ); - pPage->Left = (short) ( pPage->Left * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 ); - pPage->Right = (short) ( pPage->Right * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 ); - pPage->Head = (short) ( pPage->Head * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 ); - pPage->Foot = (short) ( pPage->Foot * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 ); + pPage->Width = (short) ( pPage->Width + 0.5 ); + pPage->Height = (short) ( pPage->Height + 0.5 ); + pPage->Top = (short) ( pPage->Top + 0.5 ); + pPage->Bottom = (short) ( pPage->Bottom + 0.5 ); + pPage->Left = (short) ( pPage->Left + 0.5 ); + pPage->Right = (short) ( pPage->Right + 0.5 ); + pPage->Head = (short) ( pPage->Head + 0.5 ); + pPage->Foot = (short) ( pPage->Foot + 0.5 ); OUString aName = lcl_MakeOldPageStyleFormatName( i ); diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index d3d77069799f..2738f10329c4 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -38,13 +38,6 @@ class ScViewData; class ScDocument; -#define FLT_DATE_BEFORE 0 -#define FLT_DATE_SINCE 1 -#define FLT_DATE_EQUAL 2 -#define FLT_DATE_NOTEQUAL 3 -#define FLT_DATE_BETWEEN 4 -#define FLT_DATE_SAVE 5 - class ScRedlinData : public RedlinData { public: diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index d384c1caf23a..b867d251f96e 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -39,14 +39,6 @@ class ScViewData; class ScDocument; -#ifndef FLT_DATE_BEFORE -#define FLT_DATE_BEFORE 0 -#define FLT_DATE_SINCE 1 -#define FLT_DATE_EQUAL 2 -#define FLT_DATE_NOTEQUAL 3 -#define FLT_DATE_BETWEEN 4 -#define FLT_DATE_SAVE 5 -#endif class ScHighlightChgDlg : public ScAnyRefDlg { diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx index 641edc0e5936..b65079166e39 100644 --- a/shell/inc/internal/config.hxx +++ b/shell/inc/internal/config.hxx @@ -28,10 +28,8 @@ #ifdef _AMD64_ #define MODULE_NAME TEXT("shlxthdl_x64.dll") -#define MODULE_NAME_FILTER TEXT("ooofilt_x64.dll") #else #define MODULE_NAME TEXT("shlxthdl.dll") -#define MODULE_NAME_FILTER TEXT("ooofilt.dll") #endif #define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("LibreOffice Column Handler") diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 6b0ad355491c..982e68480b35 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -1347,7 +1347,7 @@ shell::copy( bool isDocument = type != osl::FileStatus::Directory && type != osl::FileStatus::Volume; - sal_Int32 IsWhat = isDocument ? -1 : 1; + FileUrlType IsWhat = isDocument ? FileUrlType::File : FileUrlType::Folder; switch( NameClash ) { @@ -1485,7 +1485,7 @@ shell::copy( bool SAL_CALL shell::remove( sal_Int32 CommandId, const OUString& aUnqPath, - sal_Int32 IsWhat, + FileUrlType IsWhat, bool MustExist ) { sal_Int32 nMask = osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL; @@ -1494,7 +1494,7 @@ shell::remove( sal_Int32 CommandId, osl::FileStatus aStatus( nMask ); osl::FileBase::RC nError; - if( IsWhat == 0 ) // Determine whether we are removing a directory or a file + if( IsWhat == FileUrlType::Unknown ) // Determine whether we are removing a directory or a file { nError = osl::DirectoryItem::get( aUnqPath, aItem ); if( nError != osl::FileBase::E_None ) @@ -1519,14 +1519,14 @@ shell::remove( sal_Int32 CommandId, if( aStatus.getFileType() == osl::FileStatus::Regular || aStatus.getFileType() == osl::FileStatus::Link ) - IsWhat = -1; // RemoveFile + IsWhat = FileUrlType::File; else if( aStatus.getFileType() == osl::FileStatus::Directory || aStatus.getFileType() == osl::FileStatus::Volume ) - IsWhat = +1; // RemoveDirectory + IsWhat = FileUrlType::Folder; } - if( IsWhat == -1 ) // Removing a file + if( IsWhat == FileUrlType::File ) { nError = osl::File::remove( aUnqPath ); if( nError != osl::FileBase::E_None ) @@ -1545,7 +1545,7 @@ shell::remove( sal_Int32 CommandId, erasePersistentSet( aUnqPath ); // Removes from XPersistentPropertySet } } - else if( IsWhat == +1 ) // Removing a directory + else if( IsWhat == FileUrlType::Folder ) { osl::Directory aDirectory( aUnqPath ); @@ -1562,7 +1562,7 @@ shell::remove( sal_Int32 CommandId, } bool whileSuccess = true; - sal_Int32 recurse = 0; + FileUrlType recurse = FileUrlType::Unknown; OUString name; nError = aDirectory.getNextItem( aItem ); @@ -1580,14 +1580,13 @@ shell::remove( sal_Int32 CommandId, if( aStatus.getFileType() == osl::FileStatus::Regular || aStatus.getFileType() == osl::FileStatus::Link ) - recurse = -1; + recurse = FileUrlType::File; else if( aStatus.getFileType() == osl::FileStatus::Directory || aStatus.getFileType() == osl::FileStatus::Volume ) - recurse = +1; + recurse = FileUrlType::Folder; name = aStatus.getFileURL(); - whileSuccess = remove( - CommandId, name, recurse, MustExist ); + whileSuccess = remove( CommandId, name, recurse, MustExist ); if( !whileSuccess ) break; @@ -1973,16 +1972,16 @@ bool SAL_CALL shell::getUrlFromUnq( const OUString& Unq,OUString& Url ) osl::FileBase::RC SAL_CALL shell::copy_recursive( const OUString& srcUnqPath, const OUString& dstUnqPath, - sal_Int32 TypeToCopy, + FileUrlType TypeToCopy, bool testExistBeforeCopy ) { osl::FileBase::RC err = osl::FileBase::E_None; - if( TypeToCopy == -1 ) // Document + if( TypeToCopy == FileUrlType::File ) // Document { err = osl_File_copy( srcUnqPath,dstUnqPath,testExistBeforeCopy ); } - else if( TypeToCopy == +1 ) // Folder + else if( TypeToCopy == FileUrlType::Folder ) { osl::Directory aDir( srcUnqPath ); aDir.open(); @@ -2004,7 +2003,7 @@ shell::copy_recursive( const OUString& srcUnqPath, IsDoc = aFileStatus.getFileType() == osl::FileStatus::Regular; // Getting the information for the next recursive copy - sal_Int32 newTypeToCopy = IsDoc ? -1 : +1; + FileUrlType newTypeToCopy = IsDoc ? FileUrlType::File : FileUrlType::Folder; OUString newSrcUnqPath; if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) ) diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 2a05712557d3..5b1ff4249537 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -301,9 +301,7 @@ namespace fileaccess { const OUString& dstUnqPath, sal_Int32 NameClash ); -#define RemoveFolder 1 -#define RemoveFile -1 -#define RemoveUnknown 0 + enum class FileUrlType { Folder = 1, File = -1, Unknown = 0 }; /** * Deletes the content belonging to fileURL aUnqPath( recursively in case of directory ) @@ -312,13 +310,9 @@ namespace fileaccess { bool SAL_CALL remove( sal_Int32 CommandId, const OUString& aUnqPath, - sal_Int32 TypeToMove = RemoveUnknown, + FileUrlType eTypeToMove = FileUrlType::Unknown, bool MustExist = true ); -#undef RemoveUnknown -#undef RemoveFile -#undef RemoveFolder - /********************************************************************************/ /* write and create - commandos */ @@ -503,7 +497,7 @@ namespace fileaccess { copy_recursive( const OUString& srcUnqPath, const OUString& dstUnqPath, - sal_Int32 TypeToCopy, + FileUrlType TypeToCopy, bool testExistence ); diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index a93f75286c2c..da789cf73dd6 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -42,39 +42,30 @@ namespace webdav_ucp { // UNO service name for the provider. This name will be used by the UCB to // create instances of the provider. -#define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME \ - "com.sun.star.ucb.WebDAVContentProvider" -#define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME_LENGTH 38 +#define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME "com.sun.star.ucb.WebDAVContentProvider" // URL scheme. This is the scheme the provider will be able to create // contents for. The UCB will select the provider ( i.e. in order to create // contents ) according to this scheme. -#define WEBDAV_URL_SCHEME \ - "vnd.sun.star.webdav" +#define WEBDAV_URL_SCHEME "vnd.sun.star.webdav" #define WEBDAV_URL_SCHEME_LENGTH 19 #define HTTP_URL_SCHEME "http" -#define HTTP_URL_SCHEME_LENGTH 4 #define HTTPS_URL_SCHEME "https" -#define HTTPS_URL_SCHEME_LENGTH 5 #define DAV_URL_SCHEME "dav" #define DAV_URL_SCHEME_LENGTH 3 -#define DAVS_URL_SCHEME "davs" +#define DAVS_URL_SCHEME "davs" #define DAVS_URL_SCHEME_LENGTH 4 - - #define FTP_URL_SCHEME "ftp" -#define HTTP_CONTENT_TYPE \ - "application/" HTTP_URL_SCHEME "-content" +#define HTTP_CONTENT_TYPE "application/" HTTP_URL_SCHEME "-content" #define WEBDAV_CONTENT_TYPE HTTP_CONTENT_TYPE -#define WEBDAV_COLLECTION_TYPE \ - "application/" WEBDAV_URL_SCHEME "-collection" +#define WEBDAV_COLLECTION_TYPE "application/" WEBDAV_URL_SCHEME "-collection" @@ -126,9 +117,6 @@ public: ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // Additional interfaces - - // Non-interface methods. bool getProperty( const OUString & rPropName, diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index d0c40e06c8da..68ea8532453a 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -34,35 +34,28 @@ namespace http_dav_ucp { // UNO service name for the provider. This name will be used by the UCB to // create instances of the provider. -#define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME \ - "com.sun.star.ucb.WebDAVContentProvider" -#define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME_LENGTH 38 +#define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME "com.sun.star.ucb.WebDAVContentProvider" // URL scheme. This is the scheme the provider will be able to create // contents for. The UCB will select the provider ( i.e. in order to create // contents ) according to this scheme. -#define WEBDAV_URL_SCHEME \ - "vnd.sun.star.webdav" +#define WEBDAV_URL_SCHEME "vnd.sun.star.webdav" #define WEBDAV_URL_SCHEME_LENGTH 19 #define HTTP_URL_SCHEME "http" -#define HTTP_URL_SCHEME_LENGTH 4 #define HTTPS_URL_SCHEME "https" -#define HTTPS_URL_SCHEME_LENGTH 5 #define DAV_URL_SCHEME "dav" #define DAV_URL_SCHEME_LENGTH 3 -#define DAVS_URL_SCHEME "davs" +#define DAVS_URL_SCHEME "davs" #define DAVS_URL_SCHEME_LENGTH 4 -#define HTTP_CONTENT_TYPE \ - "application/" HTTP_URL_SCHEME "-content" +#define HTTP_CONTENT_TYPE "application/" HTTP_URL_SCHEME "-content" #define WEBDAV_CONTENT_TYPE HTTP_CONTENT_TYPE -#define WEBDAV_COLLECTION_TYPE \ - "application/" WEBDAV_URL_SCHEME "-collection" +#define WEBDAV_COLLECTION_TYPE "application/" WEBDAV_URL_SCHEME "-collection" @@ -114,13 +107,8 @@ public: ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - // Additional interfaces - - - // Non-interface methods. - bool getProperty( const OUString & rPropName, ::com::sun::star::beans::Property & rProp, bool bStrict = false ); diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx index c193937c8433..59e6a948752a 100644 --- a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx +++ b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx @@ -8,7 +8,7 @@ */ #ifndef INCLUDED_VCL_UNX_GENERIC_GDI_OPENGLX11CAIROTEXTRENDER_HXX -#define INCLUDED_VCL_UNX_GENERIC_GDI_OPENGLX11CAIROTEXTRENDER_HXX value +#define INCLUDED_VCL_UNX_GENERIC_GDI_OPENGLX11CAIROTEXTRENDER_HXX #include "x11cairotextrender.hxx" diff --git a/vcl/unx/generic/gdi/x11cairotextrender.hxx b/vcl/unx/generic/gdi/x11cairotextrender.hxx index c0c41928ceb6..f2f094f8f26c 100644 --- a/vcl/unx/generic/gdi/x11cairotextrender.hxx +++ b/vcl/unx/generic/gdi/x11cairotextrender.hxx @@ -18,7 +18,7 @@ */ #ifndef INCLUDED_VCL_UNX_GENERIC_GDI_X11CAIROTEXTRENDER_HXX -#define INCLUDED_VCL_UNX_GENERIC_GDI_X11CAIROTEXTRENDER_HXX value +#define INCLUDED_VCL_UNX_GENERIC_GDI_X11CAIROTEXTRENDER_HXX #include "cairotextrender.hxx" diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx index 42cd7045e952..a74f1a91885f 100644 --- a/vcl/unx/gtk/a11y/atkbridge.cxx +++ b/vcl/unx/gtk/a11y/atkbridge.cxx @@ -49,15 +49,15 @@ bool InitAtkBridge() } /* Initialize the AtkUtilityWrapper class */ - g_type_class_unref( g_type_class_ref( OOO_TYPE_ATK_UTIL ) ); + g_type_class_unref( g_type_class_ref( ooo_atk_util_get_type() ) ); /* Initialize the GailWindow wrapper class */ - g_type_class_unref( g_type_class_ref( OOO_TYPE_WINDOW_WRAPPER ) ); + g_type_class_unref( g_type_class_ref( ooo_window_wrapper_get_type() ) ); /* Register AtkObject wrapper factory */ AtkRegistry * registry = atk_get_default_registry(); if( registry ) - atk_registry_set_factory_type( registry, OOO_TYPE_FIXED, OOO_TYPE_WRAPPER_FACTORY ); + atk_registry_set_factory_type( registry, OOO_TYPE_FIXED, wrapper_factory_get_type() ); #endif return true; } diff --git a/vcl/unx/gtk/a11y/atkfactory.hxx b/vcl/unx/gtk/a11y/atkfactory.hxx index c7a8add0b0d6..ac72b5897813 100644 --- a/vcl/unx/gtk/a11y/atkfactory.hxx +++ b/vcl/unx/gtk/a11y/atkfactory.hxx @@ -22,8 +22,6 @@ #include -#define OOO_TYPE_WRAPPER_FACTORY wrapper_factory_get_type() - extern "C" { GType wrapper_factory_get_type(); diff --git a/vcl/unx/gtk/a11y/atkutil.hxx b/vcl/unx/gtk/a11y/atkutil.hxx index 952418869883..cb4a005157a0 100644 --- a/vcl/unx/gtk/a11y/atkutil.hxx +++ b/vcl/unx/gtk/a11y/atkutil.hxx @@ -22,8 +22,6 @@ #include -#define OOO_TYPE_ATK_UTIL ooo_atk_util_get_type() - GType ooo_atk_util_get_type(); void ooo_atk_util_ensure_event_listener(); diff --git a/vcl/unx/gtk/a11y/atkwindow.hxx b/vcl/unx/gtk/a11y/atkwindow.hxx index f2cdbee7b46f..35a4bcedf486 100644 --- a/vcl/unx/gtk/a11y/atkwindow.hxx +++ b/vcl/unx/gtk/a11y/atkwindow.hxx @@ -22,8 +22,6 @@ #include -#define OOO_TYPE_WINDOW_WRAPPER ooo_window_wrapper_get_type() - GType ooo_window_wrapper_get_type(); void restore_gail_window_vtable(); -- cgit